gentoo auto-resync : 02:04:2023 - 05:16:35

3 files changed, 12 insertions, 109 deletions

diff --git a/sci-mathematics/why3/Manifest b/sci-mathematics/why3/Manifest
index 3617b3a6a835..8f5ec61729f4 100644
--- a/sci-mathematics/why3/Manifest
+++ b/sci-mathematics/why3/Manifest
@@ -1,9 +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
-DIST why3-1.5.0.tar.gz 6723500 BLAKE2B e6ae5034cf0b3923dfaa760d604f754d4e385ea92ca1f70c7d4bd9985c75192ed381bb50d7211451f35d485e5c0969b3de4987603720b2fd6609cca5d074b85f SHA512 3ae443733321f2e487d6e503c4dbfe37d0e24c7dbe88eb94a3907775a1e6e30530b58ff835e3b2fff3fac5cd16622d758602e4f2b59aea567c7073199d67888c
 DIST why3-1.5.1.tar.gz 6727576 BLAKE2B db88dc011856bc779a917613adb20c14744f5491aba54e424909106a1133362ddf9eb22e4a05660cb3153bfddfa54c488e1f9df046e3c413732924e127975e82 SHA512 1452a21ea9191f57debcc082afe458aec503d6aa24f8bc83f734041cdd302c4f166c9c4fe5f9ec25369b6e83011bdd7b485d67b092efa71ff0c1b39447f4bdac
-EBUILD why3-1.4.0-r3.ebuild 2158 BLAKE2B 6702941175fd4768951603bbeaa095a2e2cdc2181d8ac1f7cb3eb54269852510082ec35b26eafda6422d5b2f4ded36589d28010879b23a64868ad0b92297d44d SHA512 2baf6a0d90dd277922338645567dfe28a5eb159fc90e7991430b185171be5cf6cf1404cfd336c93b1ede56c4adda83268daab01b47f66961ad60da8b2f7cc19b
+DIST why3-1.6.0.tar.gz 6850062 BLAKE2B 91db6f67a9d0fe24b7d7d18e6c5e9cd362563a55702bfb28c478754f53e831beb3033adde251214facd8d64ab923389b0b9fe7b240b6cd09f0b4b3e6f8eca143 SHA512 60d61b8337ab9f2fd2e6c7174eb0bab063f122417738cd75990c5c53120dd535bcedccb670567f5753853d6bc9f8efebb563d079e4d368372a7687193f1346b1
 EBUILD why3-1.4.1-r1.ebuild 2158 BLAKE2B 6702941175fd4768951603bbeaa095a2e2cdc2181d8ac1f7cb3eb54269852510082ec35b26eafda6422d5b2f4ded36589d28010879b23a64868ad0b92297d44d SHA512 2baf6a0d90dd277922338645567dfe28a5eb159fc90e7991430b185171be5cf6cf1404cfd336c93b1ede56c4adda83268daab01b47f66961ad60da8b2f7cc19b
-EBUILD why3-1.5.0-r1.ebuild 2340 BLAKE2B 4922cd324ab526cc24f27a81ffe92eafdb019ded5d32550ebac3f5ace92fddcd16f08238179080b20f05845eb78766e47bdf058b7c638313b4e474213799b350 SHA512 3e6d419d279f8343a2ca5ffaf6d0e29e723345c77fbd1aae1a522accc250dc56c4977378b41adc0c4731d5f086e85a014e646370378fff38cbb81eaf87494e6f
 EBUILD why3-1.5.1.ebuild 2340 BLAKE2B fb1e703be2a938d0b77eb7c3e32f4ee6a098df12dc933a7731697674e63e9f1878c0e87fd78f941e54002f97083fb7f8f9e100e40194e6deb41524b0ae358353 SHA512 a87f050be498502b7ff0b02948e37e1228cdba179aa7bf7908133af6c5c7123da3bf8be1c14b550ca0ff61fe745b5869d8b30c726cf2cad538230a09a381057d
+EBUILD why3-1.6.0.ebuild 2348 BLAKE2B 0b8f27f14bb7d2117a9f5f6451d12e57ae3123ac6f491c653fb762bdf2410b5af17f9f3d7c2655c56f6a2f3f198aad07411a7c07e4943e62e1673b66e4779e41 SHA512 7a4ff6be794f77a6a319ee5e39e0bb3c80c82777d45da510d54ab6ac1793c0d249ebf10516c4db4ad7bf27441a0ef37171c43c04295ae0bd757f34619ac6fd61
 MISC metadata.xml 1902 BLAKE2B 1868834e446b471f4b3f7b11fc987661dee83790110fa31c73f0060fd8340891ff85ec16591d1326977760c726ec04bd06a4cca46fb1a87f792340a002cba247 SHA512 4dc9408d44eafc037bfce9c996570e58c161e07c3ded2a052954c834fcf8c3a36cf8429493bc705ced7445d199eaf207cabb5df1b0ed6b625015af518e55d9e9
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