gentoo resync : 22.01.2021

5 files changed, 21 insertions, 176 deletions

diff --git a/sci-mathematics/why3-for-spark/Manifest b/sci-mathematics/why3-for-spark/Manifest
index d2cfafb26d29..a2a63949dfa3 100644
--- a/sci-mathematics/why3-for-spark/Manifest
+++ b/sci-mathematics/why3-for-spark/Manifest
@@ -3,8 +3,6 @@ AUX why3-for-spark-2019-flags.patch 920 BLAKE2B ee9cf3e956a82f79e647a71c09592593
 AUX why3-for-spark-2019-gentoo.patch 764 BLAKE2B ba9fd2c8ff6dfba4783c527cb02a5d40d0bc8d25e9039af20c1ae4498dfe7c275f5d3cf85a5bea63f86703dca8e931a4ce837c3fe4a2337918d87ec563d69de5 SHA512 61c2b1e8da73617211f9142738836be7787a9d2c2396fad73b6ed7f4d5bbe87336e38540549d8458d7ec2bd290cfdee811c4a6f19444b4e7b7de21396bcacef1
 DIST why3-2019-20190517-197BB-src.tar.gz 9439414 BLAKE2B 68072064e8ee9152528c90afc948047a1f4d58b960ac05b276761fdca5ba1204100c75f33db7bb0ea1a8a646b734e62892ed41bd875b954354f52b8f9d498d4a SHA512 9169a4ff9ee994a19f9f04b689d1b9c679f5340bcd631d7d49b4c55064f505bd5a6ca8149077e5d24d36f5365f0cab58587094e86f352a9105fc46f10c0746ba
 DIST why3-for-spark-gpl-2018-src.tar.gz 7682767 BLAKE2B 0b0272ca4d5519ca402990b234d0847378bcd2a0949fea78ea10e355233a16aebe79b938cdf8e4daadabb909171cab83b9d6ccacf9f2dc1c0b57bb6da6fd1fe0 SHA512 fc798acf343484fd8e70f470a318753c9a0e9967ff579f20ec185bf3c2a75e7a4a556388fc86a378610ce4a467f3e722c6f610da34d4c33bc3d6b10551731f07
-EBUILD why3-for-spark-2018.ebuild 1712 BLAKE2B 6bab5512436341fe88e22657752081b5ed78f6ae27f1b3e5dc95a916a2b641f1f362aba40a333b74622a3832b5c385100d9266bdc25a692f43a20a93be2605a8 SHA512 0077d68c18911e71f5ff3a54b48700b3e63dbf976acf9f153ebb9ce81d8de6f697b9750be0ac5dfd214f40677a3dbe9325d8005df169a853b90980099d7ce762
-EBUILD why3-for-spark-2019-r1.ebuild 1800 BLAKE2B 945fb823d3add5e83a0a121c077fbf1995620ff57ab061ebe6d70108a7d29a3481364f95a34f8a789b7844dcd544e5506f406317c3f0211fd42d9e50da3b4185 SHA512 e14b116249693850aef1b21b1c61f71c3ad3803bb52b36e1355ff0116d1a7075a5a0282b8814221ab2eeb41bc4823e4b259813d08bd3f3fe555497580c004a37
-EBUILD why3-for-spark-2019-r2.ebuild 2982 BLAKE2B 46845a19e57af3364b387697e96d5438d29d01f27418b11b3adefbbaf1de8463ac08950764aa7af8625945725859885484d343dbe35586e4c03c6ecad4777795 SHA512 520421eac279b9158ccd8e3f3f2cab4181ad78782396d7ef5db7f4d13d550e05023e50b8dbceeb387e533eda395cefc2312930ad9a0ee3cf78bf1d847bc07167
-EBUILD why3-for-spark-2019.ebuild 1781 BLAKE2B 00bb8e39eff2bc94757bb823c663911ad308488a3d3491e6f00a4a30e541a2724a7e29f999c4c32966d9cc45feaf99b76bf3259a6014b133d9125ccff687fdbf SHA512 81e68202740eaea33e19dad98c14e6baa9fafaa69a4a25d87132bb55248d977cc94871f50929802f67fd670a068f01ae62d9863a8a091e97c4e5d762566850c3
+EBUILD why3-for-spark-2018.ebuild 1729 BLAKE2B 14002f870711eaf350aa38c4fa8bcf3947585e08c873b6d9509756009caae20f52d389db22ef288c4c92146622ee43053cf784013331b638d6370278c5189772 SHA512 e3fac3fafa90980c2d3cf068e19477baa45cb01f517ee5dc235a7984f07f8dffb95f6ef329082bf6d5e88cfb8b02ae617b509010fdbb448644c3742b22d1733f
+EBUILD why3-for-spark-2019-r2.ebuild 3000 BLAKE2B c6f405a6e36086f7763e1717f610d2c3139e48ef259652b5489be6d0ac536efe17cada609b693e7d0d848d1c5a4d6b321015e03d7ee2f2ebff71a9ef23b08620 SHA512 27a484e227f693ad50b026e658bbe0fbdc230f7a96ee30115e8fe38149ebc9e574c638fa9e0012b6099aa5a03df3ac83ae5800b611ef6ad2406b18571831109a
 MISC metadata.xml 1363 BLAKE2B 820bfc974ca6984f78340f223f8f19d12f0313016118110a35cfe149129c2dc189d6f03f34bf3d30c9d3e5d9c9ab90bba33dca4320c034821a7a89f97b92a7f9 SHA512 ee8323cc37fdea800e355fc14ba67cac66c3ec3c41528d481a7e938b1d3e23859bdddfb06d3b6653725cdcfcc0d07e66ba1d3cc80b3637a781db7bab5f7dc677
diff --git a/sci-mathematics/why3-for-spark/why3-for-spark-2018.ebuild b/sci-mathematics/why3-for-spark/why3-for-spark-2018.ebuild
index 2335a61928f9..bb7093a5b79d 100644
--- a/sci-mathematics/why3-for-spark/why3-for-spark-2018.ebuild
+++ b/sci-mathematics/why3-for-spark/why3-for-spark-2018.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,18 +16,18 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64"
 IUSE="coq doc emacs gtk html hypothesis-selection +ocamlopt profiling zarith zip"
-RESTRICT=strip
+RESTRICT="strip"
 
-DEPEND=">=dev-lang/ocaml-4.02.3[ocamlopt?]
-	dev-ml/menhir
+DEPEND=">=dev-lang/ocaml-4.02.3:=[ocamlopt=]
+	dev-ml/menhir:=
 	coq? ( sci-mathematics/coq )
 	doc? ( dev-tex/rubber )
-	gtk? ( dev-ml/lablgtk[sourceview] )
+	gtk? ( dev-ml/lablgtk:2=[sourceview] )
 	emacs? ( >=app-editors/emacs-23.1:* )
-	html? ( dev-tex/hevea )
-	hypothesis-selection? ( dev-ml/ocamlgraph )
-	zarith? ( dev-ml/zarith )
-	zip? ( >=dev-ml/camlzip-1.07 )"
+	html? ( dev-tex/hevea:= )
+	hypothesis-selection? ( dev-ml/ocamlgraph:= )
+	zarith? ( dev-ml/zarith:= )
+	zip? ( >=dev-ml/camlzip-1.07:= )"
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}"/${MYP}
diff --git a/sci-mathematics/why3-for-spark/why3-for-spark-2019-r1.ebuild b/sci-mathematics/why3-for-spark/why3-for-spark-2019-r1.ebuild
deleted file mode 100644
index c19ce6114c3d..000000000000
--- a/sci-mathematics/why3-for-spark/why3-for-spark-2019-r1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-MYP=why3-${PV}-20190517-197BB-src
-
-DESCRIPTION="Platform for deductive program verification"
-HOMEPAGE="http://why3.lri.fr/"
-SRC_URI="http://mirrors.cdn.adacore.com/art/5cdf915d31e87a8f1c967d54
-	-> ${MYP}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="coq doc emacs gtk html hypothesis-selection +ocamlopt zarith zip"
-RESTRICT=strip
-
-DEPEND=">=dev-lang/ocaml-4.09.0[ocamlopt?]
-	>=dev-ml/ocamlbuild-0.14.0
-	dev-ml/menhir
-	dev-ml/num
-	coq? ( >=sci-mathematics/coq-8.9.1 )
-	doc? ( dev-tex/rubber )
-	gtk? ( >=dev-ml/lablgtk-2.18.8[sourceview] )
-	emacs? ( >=app-editors/emacs-23.1:* )
-	html? ( dev-tex/hevea )
-	hypothesis-selection? ( dev-ml/ocamlgraph )
-	zarith? ( dev-ml/zarith )
-	zip? ( >=dev-ml/camlzip-1.07 )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/${MYP}
-
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-
-REQUIRED_USE="html? ( doc )"
-
-src_configure() {
-	econf \
-		--disable-pvs-libs \
-		--disable-isabelle-libs \
-		--enable-verbose-make \
-		$(use_enable coq coq-libs) \
-		$(use_enable doc) \
-		$(use_enable emacs emacs-compilation) \
-		$(use_enable gtk ide) \
-		$(use_enable html html-doc) \
-		$(use_enable hypothesis-selection) \
-		$(use_enable ocamlopt native-code) \
-		$(use_enable zarith) \
-		$(use_enable zip)
-}
-
-src_compile() {
-	emake -j1
-	if use ocamlopt; then
-		emake byte
-	fi
-	use doc && emake doc
-}
-
-src_install() {
-	emake DESTDIR="${D}" -j1 install
-	emake DESTDIR="${D}" -j1 install-lib
-	emake DESTDIR="${D}" install_spark2014_dev
-	dosym ../why3server /usr/$(get_libdir)/why3/commands/why3server
-	einstalldocs
-	docompress -x /usr/share/doc/${PF}/examples
-	dodoc -r examples
-	if use doc; then
-		dodoc doc/manual.pdf
-		use html && dodoc -r doc/html
-	fi
-}
diff --git a/sci-mathematics/why3-for-spark/why3-for-spark-2019-r2.ebuild b/sci-mathematics/why3-for-spark/why3-for-spark-2019-r2.ebuild
index 7b658828da45..9fa713b6baaa 100644
--- a/sci-mathematics/why3-for-spark/why3-for-spark-2019-r2.ebuild
+++ b/sci-mathematics/why3-for-spark/why3-for-spark-2019-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,20 +14,20 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="coq doc emacs gtk html hypothesis-selection +ocamlopt zarith zip"
-RESTRICT=strip
+RESTRICT="strip"
 
-DEPEND=">=dev-lang/ocaml-4.09.0[ocamlopt?]
+DEPEND=">=dev-lang/ocaml-4.09.0:=[ocamlopt=]
 	>=dev-ml/ocamlbuild-0.14.0
-	dev-ml/menhir
-	dev-ml/num
+	dev-ml/menhir:=
+	dev-ml/num:=
 	coq? ( >=sci-mathematics/coq-8.9.1 )
 	doc? ( dev-tex/rubber )
-	gtk? ( >=dev-ml/lablgtk-2.18.8[sourceview] )
+	gtk? ( >=dev-ml/lablgtk-2.18.8:=[sourceview] )
 	emacs? ( >=app-editors/emacs-23.1:* )
-	html? ( dev-tex/hevea )
-	hypothesis-selection? ( dev-ml/ocamlgraph )
-	zarith? ( dev-ml/zarith )
-	zip? ( >=dev-ml/camlzip-1.07 )"
+	html? ( dev-tex/hevea:= )
+	hypothesis-selection? ( dev-ml/ocamlgraph:= )
+	zarith? ( dev-ml/zarith:= )
+	zip? ( >=dev-ml/camlzip-1.07:= )"
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}"/${MYP}
diff --git a/sci-mathematics/why3-for-spark/why3-for-spark-2019.ebuild b/sci-mathematics/why3-for-spark/why3-for-spark-2019.ebuild
deleted file mode 100644
index 409bfc36cda5..000000000000
--- a/sci-mathematics/why3-for-spark/why3-for-spark-2019.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-MYP=why3-${PV}-20190517-197BB-src
-
-DESCRIPTION="Platform for deductive program verification"
-HOMEPAGE="http://why3.lri.fr/"
-SRC_URI="http://mirrors.cdn.adacore.com/art/5cdf915d31e87a8f1c967d54
-	-> ${MYP}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="coq doc emacs gtk html hypothesis-selection +ocamlopt profiling zarith zip"
-RESTRICT=strip
-
-DEPEND=">=dev-lang/ocaml-4.02.3[ocamlopt?]
-	dev-ml/menhir
-	coq? ( sci-mathematics/coq )
-	doc? ( dev-tex/rubber )
-	gtk? ( dev-ml/lablgtk[sourceview] )
-	emacs? ( >=app-editors/emacs-23.1:* )
-	html? ( dev-tex/hevea )
-	hypothesis-selection? ( dev-ml/ocamlgraph )
-	zarith? ( dev-ml/zarith )
-	zip? ( >=dev-ml/camlzip-1.07 )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/${MYP}
-
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-
-REQUIRED_USE="html? ( doc )"
-
-src_configure() {
-	econf \
-		--disable-pvs-libs \
-		--disable-isabelle-libs \
-		--enable-verbose-make \
-		$(use_enable coq coq-libs) \
-		$(use_enable doc) \
-		$(use_enable emacs emacs-compilation) \
-		$(use_enable gtk ide) \
-		$(use_enable html html-doc) \
-		$(use_enable hypothesis-selection) \
-		$(use_enable ocamlopt native-code) \
-		$(use_enable profiling) \
-		$(use_enable zarith) \
-		$(use_enable zip)
-}
-
-src_compile() {
-	emake -j1
-	if use ocamlopt; then
-		emake byte
-	fi
-	use doc && emake doc
-}
-
-src_install() {
-	emake DESTDIR="${D}" -j1 install
-	emake DESTDIR="${D}" -j1 install-lib
-	emake DESTDIR="${D}" install_spark2014_dev
-	dosym ../why3server /usr/$(get_libdir)/why3/commands/why3server
-	einstalldocs
-	docompress -x /usr/share/doc/${PF}/examples
-	dodoc -r examples
-	if use doc; then
-		dodoc doc/manual.pdf
-		use html && dodoc -r doc/html
-	fi
-}