gentoo auto-resync : 04:03:2024 - 23:43:21

11 files changed, 52 insertions, 262 deletions

diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index 7e57e060bfbc..ff3737fb3298 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/cadical/Manifest b/sci-mathematics/cadical/Manifest
index 68707602780e..ce86db1a0608 100644
--- a/sci-mathematics/cadical/Manifest
+++ b/sci-mathematics/cadical/Manifest
@@ -1,7 +1,7 @@
 AUX cadical-configure.patch 380 BLAKE2B e9fd63e663811a2a067b9bb8bb05604dc5b0fb02068a04ed1f80ad7b40e3aa8981c47ad7b80475e758e6c2e44b17b175c3a793e256185d28e0029a78473837b9 SHA512 9b82cd65257253ea423df6fb711bef0d5a8fbca48dd86fde5433b0dd377bfa9778ba3141b36560d13ceb61a4df305b818f11f3a72a483a02b3b3859299d6d830
 AUX cadical-makefile.in-ar.patch 323 BLAKE2B 226618745824824d8d7ccea53a3435abed9f829ca8462994fcdf805b7e5ba18a571214a16fbb2fcaeb0c91683424402e0a3c8dd05cd8f8dbdec19ed30aa023eb SHA512 30427fb87ef6aef56b9aebc3b2e0981e79c680c73dba20d371364d1b3668b51f1cbba4b6c7467ffb979245488b8ca1f2251a6321db4991221051f0c4b8e6a4d7
-DIST cadical-1.8.0.tar.gz 649017 BLAKE2B 73db2dd0278869bc1b4fe5d1eb80e767a07c640bcd2b1901d86901a09ac6b8bdbe375017593c12ac80d7a860a0aead191777ce733452741395bf14b958bd1b03 SHA512 78dfd4a4a93090e3e00fa73c0dfde6edc781e8a69f257506f273cac46b942979335c2ae0ac1054bde68259b030ba235615275307ad077762c8770884914cfed7
 DIST cadical-1.9.4.tar.gz 691203 BLAKE2B 40fcb86e60b2c6e4f24d43976e12ae063aa00ccfc8cad78d27e85b863b0faee23213d210886fd2f374aa93b575b741fd079351d3655ee1ed5bb17f96cd0005b6 SHA512 a3477ac3a4ddcb8bb797653efa9afe992a84db94900394d401667a55630932a91e847fc943bf5509d6672523818233c247db0be4268b9d8aae1636bad1877bc3
-EBUILD cadical-1.8.0.ebuild 815 BLAKE2B 4a0582001f4c55ddac5df7ffcd5fa5306e11cd79022d691090f9a7f338c7c7a632fcf71e9e367a0c97eb31de57c7d96e28c4af8f3057d14c16cd24e3b28e3c20 SHA512 38535f28bd7a19a9ad22a49c58901073e119fe7ef606ad7393798d53c5a12b7ea4427864b494363307f57c011f793e3dc22d253aef5186c54b0504ec4bef87de
+DIST cadical-1.9.5.tar.gz 691268 BLAKE2B 68c7fcc35ef0ad5082d5bbc828363ee45c2e637f281f1829ffb34047fff73775d34615e0ac37b8b49ff20b941db85b72c0dd6de0ab5ec5a690fd80fb5489b212 SHA512 b40727847ba0217f8d24e5468874264065c5ec9cbf0600d2e2395b8396a9d5f892127018ab9d1b930599a16a0817de5b0d29136c5dc74f2a72fb0f726e825271
 EBUILD cadical-1.9.4.ebuild 923 BLAKE2B 654e146a46b3ab80d4f718bab69f5c930146f15dfeb9bcf47ec5d59e64b422064443e2ec964a8077e9818c12cae0412324f43ca8f97c0c81ff1164af529a7280 SHA512 694c7c5ab8c8b69ad9bd0d962382377900658e2da4f53563c3ffb52ec1dd2ad24ce1676f33a58bae4136a41ebb5f0a4306b2dfe3a3c9756765a11f86fd2220ea
+EBUILD cadical-1.9.5.ebuild 923 BLAKE2B 654e146a46b3ab80d4f718bab69f5c930146f15dfeb9bcf47ec5d59e64b422064443e2ec964a8077e9818c12cae0412324f43ca8f97c0c81ff1164af529a7280 SHA512 694c7c5ab8c8b69ad9bd0d962382377900658e2da4f53563c3ffb52ec1dd2ad24ce1676f33a58bae4136a41ebb5f0a4306b2dfe3a3c9756765a11f86fd2220ea
 MISC metadata.xml 613 BLAKE2B 6d7e0c1b5eae3803aa0981b195457cdcc6d2ffa2af655837e615da6ed6914ac5bec7a831ced6703ff67476561cf67139ea5519d98cdc2bd8d5781108496046e2 SHA512 b04ad6ae6e2626cea18049e3e20eb227b5580853b8ad77179ea693ed61f12d042b7ea505eb8cfafaa0121564ab0a4b6c7dcdf84f78fa2f47c465e6f61fb1a3f0
diff --git a/sci-mathematics/cadical/cadical-1.8.0.ebuild b/sci-mathematics/cadical/cadical-1.9.5.ebuild
index a71f7eebe39d..4c087365b45b 100644
--- a/sci-mathematics/cadical/cadical-1.8.0.ebuild
+++ b/sci-mathematics/cadical/cadical-1.9.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -7,20 +7,28 @@ inherit toolchain-funcs
 
 DESCRIPTION="Simplified Satisfiability Solver"
 HOMEPAGE="http://fmv.jku.at/cadical/"
-SRC_URI="https://github.com/arminbiere/${PN}/archive/rel-${PV}.tar.gz
-	-> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-rel-${PV}"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/arminbiere/${PN}.git"
+else
+	SRC_URI="https://github.com/arminbiere/${PN}/archive/rel-${PV}.tar.gz
+		-> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-rel-${PV}"
+
+	KEYWORDS="~amd64 ~x86"
+fi
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-configure.patch
-	"${FILESDIR}"/${PN}-makefile.in-ar.patch
+	"${FILESDIR}/${PN}-configure.patch"
+	"${FILESDIR}/${PN}-makefile.in-ar.patch"
 )
 
-DOCS=( BUILD.md CONTRIBUTING NEWS.md README.md VERSION )
+DOCS=( CONTRIBUTING.md NEWS.md README.md )
 
 src_configure() {
 	tc-export AR
diff --git a/sci-mathematics/coq-mathcomp/Manifest b/sci-mathematics/coq-mathcomp/Manifest
index 0a010a8bcbe5..7dbd72f0645a 100644
--- a/sci-mathematics/coq-mathcomp/Manifest
+++ b/sci-mathematics/coq-mathcomp/Manifest
@@ -1,5 +1,3 @@
-DIST coq-mathcomp-1.17.0.tar.gz 1384329 BLAKE2B e77b509c49796af7a23a4f286a83516e40e28bc03a1f3b20ddeb54321de05bc5f3ddbe0632e7462c6619180276975727b49101253b07cc9a2ae54a6662d8e5ab SHA512 06b318e2973863b5acefdd01b39065987a93952fa5f2ce9ba68df7ff7bf701c5fc82b571f53e80eadaa293935a82e8d1f891cc555db7200a923ee986918a0c76
 DIST coq-mathcomp-1.19.0.tar.gz 1407548 BLAKE2B 733d537736a19a3667a51bbfe0b0c09838670761d8dd33853bfa3f320e29b71ec5703ed7ed752823c3696e7fad97443adb20a56e39fc9ec92b2ef5ae3d41a400 SHA512 ca2a24679418e551b6c9caee9799b2773ea2fb9986adc01c8e98f078dacb70bac872531f8f91fcf57ac04d8484783fc12589ae50a078f6b38beeb01fba6adbba
-EBUILD coq-mathcomp-1.17.0.ebuild 627 BLAKE2B e022b6e2552b0a307ebe83e7d3861c0f45cbe1bbd3c69bc18a3bea71680aa74922bb20624e67bca89040ec72f51f9aeb90c2175d35b6e8fb3f54015c5986dff6 SHA512 50887be2fccf1aac5a224877c4b562d94ce41a0f1c35754968728a49f62a69b5d041366d7edd266d42d1ebf03080234f3f25a35725865f560a335a35442f8fc9
 EBUILD coq-mathcomp-1.19.0.ebuild 627 BLAKE2B a511adb713b52a1c268662e816917e1273769d53250172236c8914507a828a30d17d62bc30f9a94edf91f3dfe01d8e30e1911f49ce2d5585a5cad5047bd07f7e SHA512 2a7b76c304e15ab62481dd2a7538afaef60fb76fca28b6121eac228dff1269ad4cac68695dc77810b910cd1153a59cdb3978a5d52df32e4b91b3481e87b4cb17
 MISC metadata.xml 511 BLAKE2B 3936f96cbf938fb9de97b080566d7fdde222d7dd303ccf842c76e7bd113b31c05136aea043c354bbd2ac6d4f61e2cba4e738f9f325059d36b7bae4feaed1ae89 SHA512 af2a4cfded0990d95e0a4b77ba69aebea09dee075f9eb4023b14c4788cd4118a78b3b5a4349fed11fff347061ab4bf59a4c63c8f43b22f8513054f1b3817af2f
diff --git a/sci-mathematics/coq-mathcomp/coq-mathcomp-1.17.0.ebuild b/sci-mathematics/coq-mathcomp/coq-mathcomp-1.17.0.ebuild
deleted file mode 100644
index 4229fb64bef2..000000000000
--- a/sci-mathematics/coq-mathcomp/coq-mathcomp-1.17.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-COQ_MIN_V=8.16.0
-
-DESCRIPTION="Mathematical Components for the Coq proof assistant"
-HOMEPAGE="https://github.com/math-comp/math-comp/"
-SRC_URI="https://github.com/math-comp/math-comp/archive/mathcomp-${PV}.tar.gz
-	-> ${P}.tar.gz"
-S="${WORKDIR}/math-comp-mathcomp-${PV}/mathcomp"
-
-LICENSE="CeCILL-B"
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	>=sci-mathematics/coq-${COQ_MIN_V}:=
-	dev-lang/ocaml:=
-"
-DEPEND="${RDEPEND}"
-
-# Do not complain about CFLAGS etc since ML projects do not use them.
-QA_FLAGS_IGNORED='.*'
diff --git a/sci-mathematics/coq-serapi/Manifest b/sci-mathematics/coq-serapi/Manifest
index d98c43303d8b..9acd15d4684e 100644
--- a/sci-mathematics/coq-serapi/Manifest
+++ b/sci-mathematics/coq-serapi/Manifest
@@ -1,8 +1,5 @@
 AUX 50sertop-gentoo.el 85 BLAKE2B d06e7c0823a3bedbf5f9c91ea8ea26bc9ed9d2ea44030316a1f3d65c19e51d874f03c845af5ae8237a9562cff7c81e24196c5ae29e54d79d1ba322f51904ba5d SHA512 42e61d798800d2e4c7e0702bdff53401a06ff6def54a1c7c0a8a6fd3e6a2f502c48bc84a04356818aa2ec5241bdd63b407837df123bfad76fafb78cf8a5a6cca
 AUX coq-serapi-0.19.0-sertop-el.patch 303 BLAKE2B 106d44d3dc7e0e6400861382e582734111a2e64ab018d78722214d2858a0449e9f519fc7119893a78615e2d9afb5f481446141714a6f288cda6236f0d1156b01 SHA512 038508239e54194ff70207611c517c5f46ecb323f0492c3cd901492bc717995753dea6dd003228de7d2ccde2aaf8d87033cb5fd4271fd6f1504a00ea7de0eb82
-AUX coq-serapi-sertop.el-path.patch 319 BLAKE2B 272eca8af934e10e978d149f90ee702fba443db7506468dda344242c5fe8a336f3ba3836c536bfac9ec6e540e1ee2f4c1a031d69e42901fbea92441b64e4c2a5 SHA512 5d228659e7c07e8fae69ffbff9d6a9de3113aa444c467194ce9e238a0db86c59c2be45b3e14683e47c2453c701b869e53647c9b051652af5ced8f4b3b5a15e73
-DIST coq-serapi-0.18.1.tar.gz 275040 BLAKE2B 9224505da004ff54c3d21c394e6049b5e15b91c3531cd0d80aae89ee6ce9e92bb626a43fdef8fad58fea4d017b3ed3f13d5d1735e7cfc1ae3bcebed2c70ce332 SHA512 a8eca10734a5b1aa5c6a890998f18d673050ca1e975b5e88643176bfd627b4c0d05cf0be1b75ccfd155b9e74f357ee61bf8225fd144b6a624a3bdd359396428c
 DIST coq-serapi-0.19.0.tar.gz 180779 BLAKE2B 27083a851139e983158b4cb251d37971d0eec61dd91303a0d09512e690c56a75624dab8c5120eebaed1e7bb168d0b2b889d538854812506c4d0a804f7bee7423 SHA512 e01706beb957315011682f2f74448e66c7a8a077418eeaf7d3fa21414bdf88950b75adbfe2392656e4d6036ce6585d4d53b1dadfd8379249b2943ea389c9c83e
-EBUILD coq-serapi-0.18.1.ebuild 1494 BLAKE2B 75d3ef68924782674d04ec8aacd8426a6d9715b868d1288ce71c6550aeb98b212c98ef4c454964c9f2031c5016eddca1cedb43fb9695a97bfbd250ef97126113 SHA512 252dd29a108ce468badff4beb35ac2697fa4eb7480184a37316eb4561f5c4330c023d0f95e5f384a98c612cb826a320c4b2bd1a21480d9728f168585c76e6b31
 EBUILD coq-serapi-0.19.0.ebuild 1506 BLAKE2B 3d4fa121e18fce87c36d18c07fb74e3b476923f70297a9379ec33cf8226c784ed701de068d73739437fed6efc669f49ee71efcb869d7f249fa97b70df4f78f25 SHA512 d7b63c62d34855d298f6129dff53ca46bb805a0714719111d95611bc39d6c2db77db9d0404edc50145ae14beebe53a7acd214be42ba62720c8e3d6d2d78bf818
 MISC metadata.xml 935 BLAKE2B e1444df414ce499df466597f5e0949e8ebf2d6da23d77028546324109659f58c5f0284a315ea062410a2f2e4631aac8d3564664719e89d76ad6ded9bb8ba7a5f SHA512 172fedbb2aa42e2be9aff426d64fcd69d2dfa206bb0e6072c6ecdc14a1923a2f0676303d8d8aebfe9a3e96e0a1e89185d2d4952bdb9ba1fff44b3891f26d6bf7
diff --git a/sci-mathematics/coq-serapi/coq-serapi-0.18.1.ebuild b/sci-mathematics/coq-serapi/coq-serapi-0.18.1.ebuild
deleted file mode 100644
index c98dfba0d296..000000000000
--- a/sci-mathematics/coq-serapi/coq-serapi-0.18.1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-COQ_MIN_V=8.18.0
-COQ_MAX_V=8.19.0
-
-inherit elisp-common dune
-
-DESCRIPTION="Serialization library and protocol for interaction with the Coq proof assistant"
-HOMEPAGE="https://github.com/ejgallego/coq-serapi/"
-
-# The tarball in SRC_URI is comprised of <supported coq>+<package version>
-SRC_URI="https://github.com/ejgallego/${PN}/archive/${COQ_MIN_V}+${PV}.tar.gz
-	-> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${COQ_MIN_V}-${PV}"
-
-LICENSE="GPL-3+"
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-IUSE="emacs +ocamlopt test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=sci-mathematics/coq-${COQ_MIN_V}:= <sci-mathematics/coq-${COQ_MAX_V}:=
-	>=dev-ml/ppx_sexp_conv-0.13.0:=
-	dev-ml/cmdliner:=
-	dev-ml/ppx_compare:=
-	dev-ml/ppx_deriving:=
-	dev-ml/ppx_deriving_yojson:=
-	dev-ml/ppx_hash:=
-	dev-ml/ppx_import:=
-	dev-ml/sexplib:=
-	dev-ml/yojson:=
-"
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	emacs? ( >=app-editors/emacs-23.1:* )
-	test? ( sci-mathematics/coq-mathcomp )
-"
-
-SITEFILE="50sertop-gentoo.el"
-
-PATCHES=( "${FILESDIR}/${PN}-sertop.el-path.patch" )
-
-src_compile() {
-	dune_src_compile
-
-	use emacs && elisp-compile sertop.el
-}
-
-src_install() {
-	dune_src_install
-
-	rm -r "${ED}/usr/share/emacs" || die
-
-	if use emacs ; then
-		elisp-install "${PN}" sertop.el{,c}
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/sci-mathematics/coq-serapi/files/coq-serapi-sertop.el-path.patch b/sci-mathematics/coq-serapi/files/coq-serapi-sertop.el-path.patch
deleted file mode 100644
index 628ed22a64ff..000000000000
--- a/sci-mathematics/coq-serapi/files/coq-serapi-sertop.el-path.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-index 300a22f..63f7dcc 100644
---- a/sertop.el
-+++ b/sertop.el
-@@ -37,7 +37,7 @@
-                            (buffer-file-name))))
- 
- (defvar sertop-executable-path
--  (or (expand-file-name "sertop.native" sertop--root)
-+  (or (executable-find "sertop.native")
-       (executable-find "sertop"))
-   "Path to sertop.")
- 
diff --git a/sci-mathematics/coq/Manifest b/sci-mathematics/coq/Manifest
index 3f0f5f08e896..e80249f90020 100644
--- a/sci-mathematics/coq/Manifest
+++ b/sci-mathematics/coq/Manifest
@@ -1,7 +1,5 @@
-DIST coq-8.17.1.tar.gz 7506035 BLAKE2B 29b5b11666185ec293f50264f5a8ad66433c3ce05d74128b524f6fc3c6810551fe76d11d6f9db7d3741b829ac8bacb66948aad522d0cd2c487692c3df8b563ff SHA512 9a35311acec2a806730b94ac7dceabc88837f235c52a14c026827d9b89433bd7fa9555a9fc6829aa49edfedb24c8bbaf1411ebf463b74a50aeb17cba47745b6b
-DIST coq-8.18.0.tar.gz 7612742 BLAKE2B 2fb9f6205465ded60d2e1f7943f53ad884aea121c8129bb30c3f66c172f51f97eb553f8a745fd3ab1ec4da80d4ca08a7aea22f65d372fda3322c0f9ca7862923 SHA512 46922d5f2eb6802a148a52fd3e7f0be8370c93e7bc33cee05cf4a2044290845b10ccddbaa306f29c808e7c5019700763e37e45ff6deb507b874a4348010fed50
 DIST coq-8.19.0.tar.gz 7674352 BLAKE2B 195040c01797ac9ce67611e0c96a4601e0a48966e094e868b9f3644aa9f75fa85adf0e2e6340a14ae0a0598b746f5ad989d8f10736cd2d3852a449f6f79d2c93 SHA512 02fb5b4fb575af79e092492cbec6dc0d15a1d74a07f827f657a72d4e6066532630e5a6d15be4acdb73314bd40b9a321f9ea0584e0ccfe51fd3a56353bd30db9b
-EBUILD coq-8.17.1.ebuild 2317 BLAKE2B ff2958b7e82400115ab634dd00bac13df99ba088d8d2ec48ad61663ba0aa3690e3cad26badedad5fd12958df4c7a343b5c9d2d827a2a7aac3ba35e9ddfe3f222 SHA512 4c04bb4aa2d97dfa21868e6246d8a35d96b55e80c7bf6206ce1c67f46102c449cad25f7062c93c7defdb0e118be57c8f86d3c3323df53ce3c794617a7d4ed6d5
-EBUILD coq-8.18.0.ebuild 2317 BLAKE2B 4bc94547c21f41a7edd33aae51eff50e7fd911394e185548e645c71b181e48810997bc38dd3fc50be290873a10122958802ad75479fd20fbdc15bec82b8c8d64 SHA512 16949a6e9140d280a7081237cc83a04a99f248fce57fe4f3eb7055cf2fdf22aed84d11caa52e7c4c344660f48552c72a5d13d659dac71e61b133e1259f4a239f
+DIST coq-8.19.1.tar.gz 7675945 BLAKE2B 62ee346f50d0a22ab217a8e689c3078347519d159619b75f20a8decace356b49c60bcd5b2cec5fbcaffc758a8944f8a7940298df1c0ddddfbd858ed9269c12f3 SHA512 ec8379df34ba6e72bcf0218c66fef248b0e4c5c436fb3f2d7dd83a2c5f349dd0874a67484fcf9c0df3e5d5937d7ae2b2a79274725595b4b0065a381f70769b42
 EBUILD coq-8.19.0.ebuild 2492 BLAKE2B fe590d0bda77462a0a6ea157a80dfa7985a381b464a2721745d33c30bf5a0cca4a8545c7b7a1d64824a9537c5896f566aaec62d794bb57930741337b2b4422e8 SHA512 8893d803d164780d4830645c15c303afa4b09647025eb223c0badc154ab2f6b80b36e82bb5c63b637a9350ff0829d8206af3dc2e5f2bb504c65fc23c69679dae
+EBUILD coq-8.19.1.ebuild 2493 BLAKE2B 277efc3bf5c38592e7729a7a2e46cd21a7b5a02934ab22e4c57c8da13b59dd63bc21552291efc88cd542debe7cb940f4f93ea5e2d51aae33bb3ccc32a1fd8b7a SHA512 4196e78ef5929e6ecf2381bb11b760ddb90e9a0be00a6ce30bd8feeec15adfcc7534178f306a23fc22871d37b7de7bdf8effb3dec19731ca77ae087c21ebe2b1
 MISC metadata.xml 1047 BLAKE2B 9f6defdf213139ee6549bc8f3b36ce5e8f53ea73bd5aad9262932cbaea7e90bd97c9ffc9dbbd03ac50097c5a6f19f5ddf00dd2b74cc6a5349faf1b597244fb67 SHA512 0f5bfbdd9ffd6f64379e697ed7cf90c2d9257cd1815e520aa14235f1cb399d20fc863221a0cae803cc88e5975be964b9debc3d750a6378ea157146f2e567c5dc
diff --git a/sci-mathematics/coq/coq-8.17.1.ebuild b/sci-mathematics/coq/coq-8.17.1.ebuild
deleted file mode 100644
index 495f48055a82..000000000000
--- a/sci-mathematics/coq/coq-8.17.1.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PV=${PV/_p/pl}
-MY_P=${PN}-${MY_PV}
-
-inherit desktop dune edo
-
-DESCRIPTION="Proof assistant written in O'Caml"
-HOMEPAGE="http://coq.inria.fr/
-	https://github.com/coq/coq/"
-SRC_URI="https://github.com/coq/coq/archive/V${MY_PV}.tar.gz
-	-> ${P}.tar.gz"
-S="${WORKDIR}"/${MY_P}
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="amd64 ~x86"
-IUSE="debug doc gui +ocamlopt test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-ml/zarith:=
-	|| (
-		dev-ml/num
-		<dev-lang/ocaml-4.09.0[ocamlopt?]
-	)
-	gui? (
-		>=dev-ml/lablgtk-3.1.2:3=[sourceview,ocamlopt?]
-		>=dev-ml/lablgtk-sourceview-3.1.2:3=[ocamlopt?]
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-ml/findlib
-	doc? (
-		>=dev-java/antlr-4.7:4
-		dev-python/antlr4-python3-runtime
-		dev-python/beautifulsoup4
-		dev-python/pexpect
-		dev-python/sphinx-rtd-theme
-		dev-python/sphinxcontrib-bibtex
-		dev-tex/latexmk
-		dev-texlive/texlive-fontsextra
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-xetex
-		media-fonts/freefont
-	)
-	test? ( dev-ml/ounit2 )
-"
-
-DOCS=( CODE_OF_CONDUCT.md CONTRIBUTING.md CREDITS INSTALL.md README.md )
-
-src_prepare() {
-	# Remove failing tests. bug #904186
-	rm -r test-suite/coq-makefile/timing || die
-
-	default
-}
-
-src_configure() {
-	export CAML_LD_LIBRARY_PATH="${S}/kernel/byterun/"
-
-	dune_packages=(
-		coq-core
-		coq-stdlib
-		coqide-server
-		coq
-	)
-	use gui && dune_packages+=( coqide )
-
-	emake clean
-
-	local -a myconf=(
-		-prefix /usr
-		-libdir /usr/$(get_libdir)/coq
-		-mandir /usr/share/man
-		-docdir /usr/share/doc/${PF}
-		-datadir /usr/share/coq
-		-configdir /etc/xdg/${PN}
-		-native-compiler $(usex ocamlopt yes no)
-	)
-	use debug && myconf+=( -debug )
-	edob sh ./configure "${myconf[@]}"
-}
-
-src_compile() {
-	emake DUNEOPT="--display=short --profile release" VERBOSE=1 dunestrap
-
-	dune-compile ${dune_packages[@]}
-
-	use doc && emake refman-html
-}
-
-src_install() {
-	dune-install ${dune_packages[@]}
-
-	if use gui ; then
-		make_desktop_entry coqide "Coq IDE" "${EPREFIX}/usr/share/coq/coq.png"
-	fi
-
-	# Dune installs into /usr/<libdir>/ocaml/<coq> but
-	# Coq wants /usr/<libdir>/<coq> ; symlink those directories
-	local sym
-	for sym in ${dune_packages[@]} ; do
-		dosym $(ocamlc -where)/${sym} /usr/$(get_libdir)/${sym}
-	done
-
-	einstalldocs
-}
diff --git a/sci-mathematics/coq/coq-8.18.0.ebuild b/sci-mathematics/coq/coq-8.19.1.ebuild
index a3ac3b8a9f0a..33c2b23fecf7 100644
--- a/sci-mathematics/coq/coq-8.18.0.ebuild
+++ b/sci-mathematics/coq/coq-8.19.1.ebuild
@@ -3,36 +3,38 @@
 
 EAPI=8
 
-MY_PV=${PV/_p/pl}
-MY_P=${PN}-${MY_PV}
+MY_PV="${PV/_p/pl}"
+MY_P="${PN}-${MY_PV}"
 
-inherit desktop dune edo
+inherit check-reqs desktop dune edo
 
 DESCRIPTION="Proof assistant written in O'Caml"
 HOMEPAGE="http://coq.inria.fr/
 	https://github.com/coq/coq/"
 SRC_URI="https://github.com/coq/coq/archive/V${MY_PV}.tar.gz
 	-> ${P}.tar.gz"
-S="${WORKDIR}"/${MY_P}
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="debug doc gui +ocamlopt test"
-RESTRICT="!test? ( test )"
+
+# TODO: Lots of failing tests. Maybe investigate later.
+# RESTRICT="!test? ( test )"
+RESTRICT="test"
 
 RDEPEND="
+	dev-ml/num:=
 	dev-ml/zarith:=
-	|| (
-		dev-ml/num
-		<dev-lang/ocaml-4.09.0[ocamlopt?]
-	)
 	gui? (
 		>=dev-ml/lablgtk-3.1.2:3=[sourceview,ocamlopt?]
 		>=dev-ml/lablgtk-sourceview-3.1.2:3=[ocamlopt?]
 	)
 "
-DEPEND="${RDEPEND}"
+DEPEND="
+	${RDEPEND}
+"
 BDEPEND="
 	dev-ml/findlib
 	doc? (
@@ -48,10 +50,15 @@ BDEPEND="
 		dev-texlive/texlive-xetex
 		media-fonts/freefont
 	)
-	test? ( dev-ml/ounit2 )
+	test? (
+		dev-ml/ounit2
+	)
 "
 
+CHECKREQS_DISK_BUILD="2G"
+
 DOCS=( CODE_OF_CONDUCT.md CONTRIBUTING.md CREDITS INSTALL.md README.md )
+declare -a DUNE_PACKAGES
 
 src_prepare() {
 	# Remove failing tests. bug #904186
@@ -63,24 +70,24 @@ src_prepare() {
 src_configure() {
 	export CAML_LD_LIBRARY_PATH="${S}/kernel/byterun/"
 
-	dune_packages=(
+	DUNE_PACKAGES=(
 		coq-core
 		coq-stdlib
 		coqide-server
 		coq
 	)
-	use gui && dune_packages+=( coqide )
+	use gui && DUNE_PACKAGES+=( coqide )
 
 	emake clean
 
 	local -a myconf=(
 		-prefix /usr
-		-libdir /usr/$(get_libdir)/coq
+		-libdir "/usr/$(get_libdir)/coq"
 		-mandir /usr/share/man
-		-docdir /usr/share/doc/${PF}
+		-docdir "/usr/share/doc/${PF}"
 		-datadir /usr/share/coq
-		-configdir /etc/xdg/${PN}
-		-native-compiler $(usex ocamlopt yes no)
+		-configdir "/etc/xdg/${PN}"
+		-native-compiler "$(usex ocamlopt yes no)"
 	)
 	use debug && myconf+=( -debug )
 	edob sh ./configure "${myconf[@]}"
@@ -89,23 +96,26 @@ src_configure() {
 src_compile() {
 	emake DUNEOPT="--display=short --profile release" VERBOSE=1 dunestrap
 
-	dune-compile ${dune_packages[@]}
+	dune-compile "${DUNE_PACKAGES[@]}"
 
 	use doc && emake refman-html
 }
 
 src_install() {
-	dune-install ${dune_packages[@]}
+	dune-install "${DUNE_PACKAGES[@]}"
 
 	if use gui ; then
 		make_desktop_entry coqide "Coq IDE" "${EPREFIX}/usr/share/coq/coq.png"
 	fi
 
+	local ocamlc_where
+	ocamlc_where="$(ocamlc -where)"
+
 	# Dune installs into /usr/<libdir>/ocaml/<coq> but
 	# Coq wants /usr/<libdir>/<coq> ; symlink those directories
 	local sym
-	for sym in ${dune_packages[@]} ; do
-		dosym $(ocamlc -where)/${sym} /usr/$(get_libdir)/${sym}
+	for sym in "${DUNE_PACKAGES[@]}" ; do
+		dosym "${ocamlc_where}/${sym}" "/usr/$(get_libdir)/${sym}"
 	done
 
 	einstalldocs