gentoo resync : 12.05.2022

5 files changed, 112 insertions, 6 deletions

diff --git a/sci-mathematics/why3/Manifest b/sci-mathematics/why3/Manifest
index e33b6464dad5..80b02eefafd9 100644
--- a/sci-mathematics/why3/Manifest
+++ b/sci-mathematics/why3/Manifest
@@ -1,5 +1,7 @@
 DIST why3-1.4.0.tar.gz 6306524 BLAKE2B ade7803a608d090ea06d974ae47e920993de92a5849d60bd63dba68252919a8f4fd1f0f6a3c975fdb727c4ae3afe13921b5d31a14c005e0d08f518e64bcf05e5 SHA512 b492f08a3c7073782b143a4849c47766b12045ad53c56aa8d251fd5b6bc1863ddebe260c99b3ddb27c4e1e1e9ab986c8b02286ec24f4c30f99f81f5f13fdc90a
 DIST why3-1.4.1.tar.gz 6305011 BLAKE2B 2d916fbf333550f8021bff9e7ccf4ca5685763ca7f82ae133298feaf96f3e8b36290a103fd27224fb6fb2dc36c8d7ad5d93ffc92e8cf7fe1a61abb5a40aecb39 SHA512 7990519179c088be1bc9b5b6d469f6d6fbd683445e20cbf5edd5c97682f2931b2657a92b60e539d7647033bfdc5a63401f28af61fd9b14b41011144afa2016e0
-EBUILD why3-1.4.0-r2.ebuild 2170 BLAKE2B 4a69d3d119d8ac3dd1d33a820717b1f59d88eb888f168ab5c019e23457de62d81ee07bf7d64ad48a63ab90fe864084588a54d4e7b8163e86cff5f2dbd8185a4e SHA512 99073cf81b27903bd21c0c7d7ce898a449191aeb6e23e3ac81e58cebf6704a2a829d03c847c810093f8ee835f677bae1f64c8b20ffc9f37f74e04ee11e771a5e
-EBUILD why3-1.4.1.ebuild 2170 BLAKE2B c306a13b879781df2fc69417d2eac73309bd4d9998350f6921c33a735936d47e093fa4d8996a043e1535bbfb3e83d460097111f220c7f8ef55655678047eb60e SHA512 247e47ab5f787b34a1a7dd0624bfeedb3a496aec835f985058f577d4a871c239e1b908018639f1c1e27526e37cbc6e8f8e139d079b66b31e8ceca8e8feb7b58d
-MISC metadata.xml 1817 BLAKE2B 671ffd58aff152784984d09096259164d691bebbdb057822a8f26c43613b1a057dceb1f6f3ecb7ed4db314630cee206a80c6c819711f6177c343f74c8f9c1267 SHA512 d2c22dec72fadca68284bd2c44b4c39b3a3d41476ab311be7abc50ca9e10d99840eb28aac504a627828fb2a98141acaacbf09d437bc6d8b90f4cb668b6565202
+DIST why3-1.5.0.tar.gz 6723500 BLAKE2B e6ae5034cf0b3923dfaa760d604f754d4e385ea92ca1f70c7d4bd9985c75192ed381bb50d7211451f35d485e5c0969b3de4987603720b2fd6609cca5d074b85f SHA512 3ae443733321f2e487d6e503c4dbfe37d0e24c7dbe88eb94a3907775a1e6e30530b58ff835e3b2fff3fac5cd16622d758602e4f2b59aea567c7073199d67888c
+EBUILD why3-1.4.0-r2.ebuild 2170 BLAKE2B b9f9edd408278d9be81f88c16d343f4b0f1a6fc5cc7b19009e4b5683469f8cc08d7d4d82a583b54cec0327b18852c2a1597443891f753bfb1e3442f617b40e10 SHA512 93a3d0da51d5cfff710de6abad4bcfdf7c6aaf01beb0e42bd2220eb57e3e2718caa4044524731c2ea26474f6757f1c2e603996f9c74dc96e798c78e4ed8c6933
+EBUILD why3-1.4.1.ebuild 2170 BLAKE2B b9f9edd408278d9be81f88c16d343f4b0f1a6fc5cc7b19009e4b5683469f8cc08d7d4d82a583b54cec0327b18852c2a1597443891f753bfb1e3442f617b40e10 SHA512 93a3d0da51d5cfff710de6abad4bcfdf7c6aaf01beb0e42bd2220eb57e3e2718caa4044524731c2ea26474f6757f1c2e603996f9c74dc96e798c78e4ed8c6933
+EBUILD why3-1.5.0.ebuild 2352 BLAKE2B da183a5eddf06dce8fe5728a59d6d5ba021597177e9ba55b0dd788c86f2b16b099137c949e9c51e9bec3adecc4d3e7bbef1c473a70ae9f945b74b67fa4581161 SHA512 41906dfddf392cb77ca641f020cf9411f4216146046db94edb0ab37335746233204609b73bd0359fab8eddd80076c6cdce753549165f01237f01bb85a6d7869d
+MISC metadata.xml 1902 BLAKE2B 1868834e446b471f4b3f7b11fc987661dee83790110fa31c73f0060fd8340891ff85ec16591d1326977760c726ec04bd06a4cca46fb1a87f792340a002cba247 SHA512 4dc9408d44eafc037bfce9c996570e58c161e07c3ded2a052954c834fcf8c3a36cf8429493bc705ced7445d199eaf207cabb5df1b0ed6b625015af518e55d9e9
diff --git a/sci-mathematics/why3/metadata.xml b/sci-mathematics/why3/metadata.xml
index 9974e9e2b8a1..c8d6f06359fb 100644
--- a/sci-mathematics/why3/metadata.xml
+++ b/sci-mathematics/why3/metadata.xml
@@ -31,6 +31,7 @@
     <flag name="gtk">Build the IDE <pkg>x11-libs/gtk+</pkg></flag>
     <flag name="re">Use Re (<pkg>dev-ml/re</pkg>) instead of Str for regular expressions</flag>
     <flag name="sexp">Add support for outputting S-expressions with <pkg>dev-ml/ppx_sexp_conv</pkg></flag>
+    <flag name="stackify">Enable structure reconstruction algorithm for MLCFG</flag>
     <flag name="zarith">Use Zarith (<pkg>dev-ml/zarith</pkg>) instead of Nums (<pkg>dev-ml/num</pkg>) for computations</flag>
     <flag name="zip">Enable compression of session files</flag>
   </use>
diff --git a/sci-mathematics/why3/why3-1.4.0-r2.ebuild b/sci-mathematics/why3/why3-1.4.0-r2.ebuild
index 85da04d96b8a..efe23fa3bbde 100644
--- a/sci-mathematics/why3/why3-1.4.0-r2.ebuild
+++ b/sci-mathematics/why3/why3-1.4.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ 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-20151112:=
+	>=dev-ml/menhir-20170418:=
 	dev-ml/num:=
 	coq? ( >=sci-mathematics/coq-8.6 )
 	emacs? ( app-editors/emacs:* )
diff --git a/sci-mathematics/why3/why3-1.4.1.ebuild b/sci-mathematics/why3/why3-1.4.1.ebuild
index a9a9ef515374..efe23fa3bbde 100644
--- a/sci-mathematics/why3/why3-1.4.1.ebuild
+++ b/sci-mathematics/why3/why3-1.4.1.ebuild
@@ -17,7 +17,7 @@ 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-20151112:=
+	>=dev-ml/menhir-20170418:=
 	dev-ml/num:=
 	coq? ( >=sci-mathematics/coq-8.6 )
 	emacs? ( app-editors/emacs:* )
diff --git a/sci-mathematics/why3/why3-1.5.0.ebuild b/sci-mathematics/why3/why3-1.5.0.ebuild
new file mode 100644
index 000000000000..9c250c09c3d0
--- /dev/null
+++ b/sci-mathematics/why3/why3-1.5.0.ebuild
@@ -0,0 +1,103 @@
+# 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="http://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 stackify +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.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:= )
+"
+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
+
+	# remove QA warning about duplicated compressed file:
+	rm examples/mlcfg/basic/why3shapes.gz || 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 stackify)
+		$(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
+}