sci-mathematics/why3-for-spark: Enable coq tactics

Package-Manager: Portage-2.3.8, Repoman-2.3.3

diff --git a/sci-mathematics/why3-for-spark/files/why3-for-spark-2017-gentoo.patch b/sci-mathematics/why3-for-spark/files/why3-for-spark-2017-gentoo.patch
index 502f394afa2be8bef89286f65973ac33d8dd338b..225d081ca7f9685fc96fc2a09d684c524b667aa1 100644 (file)
--- a/sci-mathematics/why3-for-spark/files/why3-for-spark-2017-gentoo.patch
+++ b/sci-mathematics/why3-for-spark/files/why3-for-spark-2017-gentoo.patch
@@ -12,3 +12,29 @@
  
  let rec file_concat l =
    match l with
+--- why3-for-spark-gpl-2017-src/src/coq-tactic/why3tac.ml4.old 2017-10-26 22:25:55.289094778 +0200
++++ why3-for-spark-gpl-2017-src/src/coq-tactic/why3tac.ml4     2017-10-26 22:26:10.719807270 +0200
+@@ -1352,7 +1352,7 @@
+     let limit =
+     { Call_provers.empty_limit with Call_provers.limit_time = timelimit } in
+     let call = Driver.prove_task ~command ~limit drv !task in
+-    wait_on_call call
++    wait_on_call (ServerCall call)
+   with
+     | NotFO ->
+         if debug then Printexc.print_backtrace stderr; flush stderr;
+@@ -1399,14 +1399,8 @@
+   | StepLimitExceeded -> error "Step Limit Exceeded"
+   | HighFailure -> error ("Prover failure\n" ^ res.pr_output ^ "\n")
+ 
+-IFDEF COQ84 THEN
+-
+-ELSE
+-
+ let why3tac ?timelimit s = Proofview.V82.tactic (why3tac ?timelimit s)
+ 
+-END
+-
+ end
+ 
+ TACTIC EXTEND Why3

diff --git a/sci-mathematics/why3-for-spark/why3-for-spark-2017.ebuild b/sci-mathematics/why3-for-spark/why3-for-spark-2017.ebuild
index c143320a492d008a12fbef64676a20be06bfbe6e..3fd44106514080a3252090147c27dde04561fc3a 100644 (file)
--- a/sci-mathematics/why3-for-spark/why3-for-spark-2017.ebuild
+++ b/sci-mathematics/why3-for-spark/why3-for-spark-2017.ebuild
@@ -46,10 +46,10 @@ src_prepare() {
 
 src_configure() {
        econf \
-               --disable-coq-tactic \
                --disable-pvs-libs \
                --disable-isabelle-libs \
                $(use_enable coq coq-libs) \
+               $(use_enable coq coq-tactic) \
                $(use_enable doc) \
                $(use_enable emacs emacs-compilation) \
                $(use_enable gtk ide) \