Merge updates from master

10 files changed, 62 insertions, 183 deletions

diff --git a/dev-ml/camlp-streams/Manifest b/dev-ml/camlp-streams/Manifest
index f425793b6894..6973a627864a 100644
--- a/dev-ml/camlp-streams/Manifest
+++ b/dev-ml/camlp-streams/Manifest
@@ -1,2 +1 @@
 DIST camlp-streams-5.0.1.tar.gz 17392 BLAKE2B bec87a4b9717bcd05799317542533a83e43b5d7dcdc0d691595678613da4f091f087c00487e1499e088687cc9cf21381386c92e25db9d5f182200805452b43fd SHA512 2efa8dd4a636217c8d49bac1e4e7e5558fc2f45cfea66514140a59fd99dd08d61fb9f1e17804997ff648b71b13820a5d4a1eb70fed9d848aa2abd6e41f853c86
-DIST camlp-streams-5.0.tar.gz 6992 BLAKE2B 54025cec15420ec8e1ad8ce6faaf9132b9197c3bb57acb9b4f39f4dd83939aac25104a6d4fd40035db22cdd33dbffc92597b6913702a252180ef62b60c2503be SHA512 f42e2f5e5ca353b3d647cd7e97a278c167c2d1abd185a634f155965cec29e35d9be7ce940b4c205b0577d7e9b6f714580bfd2e2fd79f1b1b461bc3fb96d26d36
diff --git a/dev-ml/camlp-streams/camlp-streams-5.0.ebuild b/dev-ml/camlp-streams/camlp-streams-5.0.ebuild
deleted file mode 100644
index d70a39d04000..000000000000
--- a/dev-ml/camlp-streams/camlp-streams-5.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit dune
-
-DESCRIPTION="Stream and Genlex libraries for use with Camlp4 and Camlp5"
-HOMEPAGE="https://github.com/ocaml/camlp-streams"
-SRC_URI="https://github.com/ocaml/${PN}/archive/refs/tags/v${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="LGPL-2-with-linking-exception"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-BDEPEND=""
-
-IUSE="+ocamlopt"
diff --git a/sci-mathematics/easycrypt/Manifest b/sci-mathematics/easycrypt/Manifest
index b2048b21a4d8..8e06e0b9306e 100644
--- a/sci-mathematics/easycrypt/Manifest
+++ b/sci-mathematics/easycrypt/Manifest
@@ -1,3 +1,2 @@
-DIST easycrypt-1.0_pre20220303.tar.gz 1193244 BLAKE2B f4d4b0661b7c58d9dd2c344efac45aa4257b46122cef81f98ced05792c1e4dd49d332421f09d0b11a28893096042a98a7415d06e1624aaa59cea0c71f17f4bb8 SHA512 bd9f1638631c9539aea3ee369705fbaafa06d575db395b3d170642af2450b7df735a18fe8f6aa6e8904eae62bdcd30743ab734f7c17c583ece7c146fee1bcf77
-DIST easycrypt-2022.04.tar.gz 1277930 BLAKE2B 4bb68325b9894e28dcf33f2b78f63c029375ba4f77d0df06cedff3a26be768827c9fb25f49cc8ecc8a2d341191fb0b9371825979f0f7cd14c69b3ced16ddc32c SHA512 9234de7f28999a6de79a3ecd27d3499ffb15fe651b2a577cf0b49fc73e034bbe1b4d99c2a7aafd3df70d9b4e095d1ae09ed8ff7a7885c020f9e5c990afe9b592
 DIST easycrypt-2022.04_p20220505.tar.gz 1279876 BLAKE2B 10ae22e216b8a35973ad7d1dbffe1dba9ce328b67319577cd1a7fad957f08174d1651ee6c1bab8cdf12d8fda20cb85d5a334ad41dfb3e55f9ee8beb8a233a2eb SHA512 b1231e0be787a667c836d970236d47311e490443a66bc0a3834963557b32358ad9db2008e32d427d232f2a94c72afc65bd3330b6db1eb938335791ea997b4013
+DIST easycrypt-2022.04_p20230324.tar.gz 1296898 BLAKE2B 119cb10ad5c2cd50db9f70eb858e2779cae0350b9e5370060b8045f36684a9de87ad746e75c6a7e7fcc7ad93e40bde2164866bb16e67dd2ebc3409657760cbd8 SHA512 917d5ff2fe65a1fd02a19d700cfb77910290746023458b6ed9eb9dc1290faa5469571a3c77510caac8734ad7d2ada6c7fbfc75bb933d0a57e9c303a8cf207026
diff --git a/sci-mathematics/easycrypt/easycrypt-2022.04-r1.ebuild b/sci-mathematics/easycrypt/easycrypt-2022.04-r1.ebuild
deleted file mode 100644
index 0e74e30a9b91..000000000000
--- a/sci-mathematics/easycrypt/easycrypt-2022.04-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit dune
-
-DESCRIPTION="Computer-Aided Cryptographic Proofs"
-HOMEPAGE="https://github.com/EasyCrypt/easycrypt"
-
-if [[ "${PV}" == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/EasyCrypt/${PN}.git"
-else
-	SRC_URI="https://github.com/EasyCrypt/${PN}/archive/r${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}"/${PN}-r${PV}
-fi
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-IUSE="+ocamlopt"
-
-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:=
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	local theories="[\"$(ocamlc -where)/easycrypt/theories\"]"
-	sed -i "s|EcRelocate\.Sites\.theories|${theories}|g" src/ec.ml || die
-
-	default
-}
diff --git a/sci-mathematics/easycrypt/easycrypt-1.0_pre20220303-r1.ebuild b/sci-mathematics/easycrypt/easycrypt-2022.04_p20230324.ebuild
index bb9b0527be75..8434aa25bbc1 100644
--- a/sci-mathematics/easycrypt/easycrypt-1.0_pre20220303-r1.ebuild
+++ b/sci-mathematics/easycrypt/easycrypt-2022.04_p20230324.ebuild
@@ -3,30 +3,36 @@
 
 EAPI=8
 
-[[ ${PV} == *_pre20220303 ]] && COMMIT=c98b014c131b6c0b147b852902953dd6c5771603
-
 inherit dune
 
 DESCRIPTION="Computer-Aided Cryptographic Proofs"
-HOMEPAGE="https://github.com/EasyCrypt/easycrypt"
+HOMEPAGE="https://github.com/EasyCrypt/easycrypt/"
 
-if [[ ${PV} == *9999* ]]; then
+if [[ ${PV} == *9999* ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/EasyCrypt/${PN}.git"
 else
-	SRC_URI="https://github.com/EasyCrypt/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${PN}-${COMMIT}"
+	if [[ ${PV} == *_p20230324 ]] ; then
+	   COMMIT=f62625928cc0970c88839c84897d1f6b17437519
+	   SRC_URI="https://github.com/EasyCrypt/${PN}/archive/${COMMIT}.tar.gz
+			-> ${P}.tar.gz"
+	   S="${WORKDIR}"/${PN}-${COMMIT}
+	else
+		SRC_URI="https://github.com/EasyCrypt/${PN}/archive/${PV}.tar.gz
+			-> ${P}.tar.gz"
+	fi
+	KEYWORDS="~amd64"
 fi
 
-LICENSE="CeCILL-B CeCILL-C"
+LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64"
 IUSE="+ocamlopt"
 
 RDEPEND="
 	>=dev-lang/ocaml-4.08.0:=[ocamlopt?]
-	>=sci-mathematics/why3-1.4:= <sci-mathematics/why3-1.5:=
+	>=sci-mathematics/why3-1.6:= <sci-mathematics/why3-1.7:=
 	dev-ml/batteries:=
+	dev-ml/camlp-streams:=
 	dev-ml/camlzip:=
 	dev-ml/dune-build-info:=
 	dev-ml/dune-site:=
diff --git a/sci-mathematics/flocq/Manifest b/sci-mathematics/flocq/Manifest
index f04ae7c7ad49..094cfd9c64ee 100644
--- a/sci-mathematics/flocq/Manifest
+++ b/sci-mathematics/flocq/Manifest
@@ -1 +1,2 @@
 DIST flocq-4.1.0.tar.gz 447412 BLAKE2B 1b993a0e86bd440602b16b94ed5aff4b95a3c732eca87c683d239702b285dee8eaaf7dad77f730ae4929bb24504e5fd12b9a181d48efac4c3db7f0606637c018 SHA512 677e0de1406b3c7e5504d114a5b18ec07c719bbad79a2cfb750ac309fd5ab09be5493afdb1786b5a188cece59fddcd4167e28bf3be4facbdea8fe3b11cdf1ab1
+DIST flocq-4.1.1.tar.gz 450132 BLAKE2B 00821a3e135156640320d1afd548bc1912953bba64cc675b7b6c94b4e3c792c444bfbb4ef1a3352adefa466548083e32c2b1e4b38747dcbc6ac6de6d72250a74 SHA512 7076b8d5e33b8225e0124b9f66f4e3e1ed3e30804c5bca28e30d5e176c1b8c5c3d777a28c243fada17ab4ed32f580c6d606b11f045d48f7acb15e03db59870c4
diff --git a/sci-mathematics/flocq/flocq-4.1.1.ebuild b/sci-mathematics/flocq/flocq-4.1.1.ebuild
new file mode 100644
index 000000000000..f70775d38f46
--- /dev/null
+++ b/sci-mathematics/flocq/flocq-4.1.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multiprocessing
+
+DESCRIPTION="Formalization of floating-point arithmetic for the Coq proof assistant"
+HOMEPAGE="http://flocq.gforge.inria.fr/
+	https://gitlab.inria.fr/flocq/flocq/"
+SRC_URI="https://flocq.gitlabpages.inria.fr/releases/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-lang/ocaml:=
+	>=sci-mathematics/coq-8.12:=
+"
+DEPEND="${RDEPEND}"
+
+src_compile() {
+	./remake --jobs=$(makeopts_jobs) || die
+}
+
+src_install() {
+	DESTDIR="${D}" ./remake install || die
+
+	dodoc AUTHORS INSTALL.md NEWS.md README.md
+
+	insinto /usr/share/${PN}
+	doins -r examples
+}
diff --git a/sci-mathematics/why3/Manifest b/sci-mathematics/why3/Manifest
index 4f6bc6bc9f21..b4c557cc84db 100644
--- a/sci-mathematics/why3/Manifest
+++ b/sci-mathematics/why3/Manifest
@@ -1,4 +1,3 @@
-DIST why3-1.4.0.tar.gz 6306524 BLAKE2B ade7803a608d090ea06d974ae47e920993de92a5849d60bd63dba68252919a8f4fd1f0f6a3c975fdb727c4ae3afe13921b5d31a14c005e0d08f518e64bcf05e5 SHA512 b492f08a3c7073782b143a4849c47766b12045ad53c56aa8d251fd5b6bc1863ddebe260c99b3ddb27c4e1e1e9ab986c8b02286ec24f4c30f99f81f5f13fdc90a
 DIST why3-1.4.1.tar.gz 6305011 BLAKE2B 2d916fbf333550f8021bff9e7ccf4ca5685763ca7f82ae133298feaf96f3e8b36290a103fd27224fb6fb2dc36c8d7ad5d93ffc92e8cf7fe1a61abb5a40aecb39 SHA512 7990519179c088be1bc9b5b6d469f6d6fbd683445e20cbf5edd5c97682f2931b2657a92b60e539d7647033bfdc5a63401f28af61fd9b14b41011144afa2016e0
-DIST why3-1.5.0.tar.gz 6723500 BLAKE2B e6ae5034cf0b3923dfaa760d604f754d4e385ea92ca1f70c7d4bd9985c75192ed381bb50d7211451f35d485e5c0969b3de4987603720b2fd6609cca5d074b85f SHA512 3ae443733321f2e487d6e503c4dbfe37d0e24c7dbe88eb94a3907775a1e6e30530b58ff835e3b2fff3fac5cd16622d758602e4f2b59aea567c7073199d67888c
 DIST why3-1.5.1.tar.gz 6727576 BLAKE2B db88dc011856bc779a917613adb20c14744f5491aba54e424909106a1133362ddf9eb22e4a05660cb3153bfddfa54c488e1f9df046e3c413732924e127975e82 SHA512 1452a21ea9191f57debcc082afe458aec503d6aa24f8bc83f734041cdd302c4f166c9c4fe5f9ec25369b6e83011bdd7b485d67b092efa71ff0c1b39447f4bdac
+DIST why3-1.6.0.tar.gz 6850062 BLAKE2B 91db6f67a9d0fe24b7d7d18e6c5e9cd362563a55702bfb28c478754f53e831beb3033adde251214facd8d64ab923389b0b9fe7b240b6cd09f0b4b3e6f8eca143 SHA512 60d61b8337ab9f2fd2e6c7174eb0bab063f122417738cd75990c5c53120dd535bcedccb670567f5753853d6bc9f8efebb563d079e4d368372a7687193f1346b1
diff --git a/sci-mathematics/why3/why3-1.4.0-r3.ebuild b/sci-mathematics/why3/why3-1.4.0-r3.ebuild
deleted file mode 100644
index 6d1e01d9863c..000000000000
--- a/sci-mathematics/why3/why3-1.4.0-r3.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools findlib
-
-DESCRIPTION="Platform for deductive program verification"
-HOMEPAGE="https://why3.lri.fr/"
-SRC_URI="https://why3.gitlabpages.inria.fr/releases/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-IUSE="coq doc emacs gtk +ocamlopt re sexp +zarith zip"
-
-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:= )
-	sexp? (
-		dev-ml/ppx_deriving:=[ocamlopt?]
-		dev-ml/ppx_sexp_conv:=[ocamlopt?]
-		dev-ml/sexplib:=[ocamlopt?]
-	)
-	zarith? ( dev-ml/zarith:= )
-	zip? ( dev-ml/camlzip:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	doc? (
-		dev-python/sphinx
-		dev-python/sphinxcontrib-bibtex
-		media-gfx/graphviz
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-fontsrecommended
-		dev-texlive/texlive-latexextra
-	)
-"
-
-DOCS=( CHANGES.md README.md )
-
-src_prepare() {
-	mv configure.in configure.ac || die
-	sed -i 's/configure\.in/configure.ac/g' Makefile.in || die
-	sed -e '/^lib\/why3[a-z]*\$(EXE):/{n;s/-Wall/$(CFLAGS) $(LDFLAGS)/}' \
-		-e '/^%.o: %.c/{n;s/\$(CC).*-o/$(CC) $(CFLAGS) -o/}' \
-		-e '/\$(SPHINX)/s/ -d doc\/\.doctrees / /' \
-		-i Makefile.in || die
-
-	eautoreconf
-	default
-}
-
-src_configure() {
-	local myconf=(
-		--disable-hypothesis-selection
-		--disable-pvs-libs
-		--disable-isabelle-libs
-		--disable-frama-c
-		--disable-infer
-		--disable-web-ide
-		$(use_enable coq coq-libs)
-		$(use_enable doc)
-		$(use_enable emacs emacs-compilation)
-		$(use_enable gtk ide)
-		$(use_enable ocamlopt native-code)
-		$(use_enable re)
-		$(use_enable sexp pp-sexp)
-		$(use_enable zarith)
-		$(use_enable zip)
-	)
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	emake
-	emake plugins
-	use doc && emake doc
-}
-
-src_install(){
-	findlib_src_preinst
-	emake install install-lib DESTDIR="${ED}"
-
-	einstalldocs
-	docompress -x /usr/share/doc/${PF}/examples
-	dodoc -r examples
-	if use doc; then
-		dodoc doc/latex/manual.pdf
-		dodoc -r doc/html
-	fi
-}
diff --git a/sci-mathematics/why3/why3-1.5.0-r1.ebuild b/sci-mathematics/why3/why3-1.6.0.ebuild
index d592ff2803b1..1c3b6b458cc9 100644
--- a/sci-mathematics/why3/why3-1.5.0-r1.ebuild
+++ b/sci-mathematics/why3/why3-1.6.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit autotools findlib
 
@@ -19,7 +19,7 @@ RDEPEND="
 	>=dev-lang/ocaml-4.05.0:=[ocamlopt?]
 	>=dev-ml/menhir-20170418:=
 	dev-ml/num:=
-	coq? ( >=sci-mathematics/coq-8.7 )
+	coq? ( >=sci-mathematics/coq-8.7:= )
 	emacs? ( app-editors/emacs:* )
 	gtk? ( dev-ml/lablgtk:=[sourceview,ocamlopt?] )
 	re? ( dev-ml/re:= )
@@ -48,6 +48,7 @@ DOCS=( CHANGES.md README.md )
 
 src_prepare() {
 	mv configure.in configure.ac || die
+
 	sed -i 's/configure\.in/configure.ac/g' Makefile.in || die
 	sed -e '/^lib\/why3[a-z]*\$(EXE):/{n;s/-Wall/$(CFLAGS) $(LDFLAGS)/}' \
 		-e '/^%.o: %.c/{n;s/\$(CC).*-o/$(CC) $(CFLAGS) -o/}' \
@@ -62,12 +63,12 @@ src_prepare() {
 }
 
 src_configure() {
-	local myconf=(
-		--disable-hypothesis-selection
-		--disable-pvs-libs
-		--disable-isabelle-libs
+	local -a myconf=(
 		--disable-frama-c
+		--disable-hypothesis-selection
 		--disable-infer
+		--disable-isabelle-libs
+		--disable-pvs-libs
 		--disable-web-ide
 		$(use_enable coq coq-libs)
 		$(use_enable doc)
@@ -86,6 +87,7 @@ src_configure() {
 src_compile() {
 	emake
 	emake plugins
+
 	use doc && emake doc
 }
 
@@ -96,6 +98,7 @@ src_install(){
 	einstalldocs
 	docompress -x /usr/share/doc/${PF}/examples
 	dodoc -r examples
+
 	if use doc; then
 		dodoc doc/latex/manual.pdf
 		dodoc -r doc/html