[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-solver/, dev-ml/opam-solver/files/

[Sam James]

commit: 7e71a5c252b35f23048b617671b15e82e54f3dc9
Author: Sam James  gentoo  org>
AuthorDate: Sat Oct  2 05:51:11 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Oct  2 21:10:33 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e71a5c2

dev-ml/opam-solver: add 2.1.0

Signed-off-by: Sam James  gentoo.org>

 dev-ml/opam-solver/Manifest|   2 +
 .../files/opam-solver-2.1.0-dose3-6.patch  | 526 +
 dev-ml/opam-solver/opam-solver-2.1.0.ebuild|  46 ++
 3 files changed, 574 insertions(+)

diff --git a/dev-ml/opam-solver/Manifest b/dev-ml/opam-solver/Manifest
index a8c97c7a26f..0b145947da0 100644
--- a/dev-ml/opam-solver/Manifest
+++ b/dev-ml/opam-solver/Manifest
@@ -1,2 +1,4 @@
 DIST opam-2.0.8.tar.gz 643221 BLAKE2B 
66510a18285f315fe95665e8ba2f334dd44211c716543cdc25f2951a7dfe537f115981046e5963fd08deea4c76f5672fa7cf8e7af2274a713a3165bdd0bac8c2
 SHA512 
14737dc994be2c54dfeaf2658d3713178033e1bc2b4b845a58b4bfc118bbbf12b502924add0ae32b4b2b6c1944462e5ee7143df3de362d9ee39573249d013bc9
 DIST opam-2.0.9.tar.gz 644429 BLAKE2B 
d96ee79685a8ee8ff82c7570a747c80e38d86e513736a27904a4e471d1eaf432db72998251ac786cb8fbf1ad425fff42b772c5d26934e0929aae75c0946d4659
 SHA512 
0d8ee19ac0f3df9de4fd9cfa8daab1f7228f090f5e2e7e26bedf24d8c2ab377aade95048f2d7cd9ee9dbbe738729e26dc99f41f730fa2252df74953362464a22
+DIST opam-2.1.0-dose3-6.patch.xz 5896 BLAKE2B 
f605064ebae7d327895729962a345a3c679519895aa2568f0c2d199d4ba9d6ae948a4fc418cfd26cc65079eb6ef3545f24a35e08c969d215529664a80d0c9147
 SHA512 
e00da74d7baef62319e884e3a05112bcf86a02d887c274bd15fb0d15bb8198e9a37a421f388bec3fce198e7a1b4d37024b18609dc65978c6ee8a7889df9bd608
+DIST opam-2.1.0.tar.gz 825966 BLAKE2B 
42ab8ad2825e4e167618ece7bd2ce77ff055d584039fe2f644fa1c3e99d175cc7047f32bda53599af4fb177d844970883125cebca823024d1bc43a34857f20c5
 SHA512 
c0060e609c49a12dc8f64accef990aa593db818b72df3984fb9b4b22d8678b46c515916c84134a62dab614c716b61788eadc954d295f32c1f27d38aec22b3edf

diff --git a/dev-ml/opam-solver/files/opam-solver-2.1.0-dose3-6.patch 
b/dev-ml/opam-solver/files/opam-solver-2.1.0-dose3-6.patch
new file mode 100644
index 000..fd613125eed
--- /dev/null
+++ b/dev-ml/opam-solver/files/opam-solver-2.1.0-dose3-6.patch
@@ -0,0 +1,526 @@
+https://github.com/ocaml/opam/commit/9082b989f1c039a006fd58672de41f620a330e80
+https://github.com/ocaml/opam/commit/2e03a20abedb40cccb5295361649c64a8df46505
+
+From: Kate 
+Date: Fri, 29 Jan 2021 02:56:21 +
+Subject: [PATCH] Make opam-solver compatible with dose3 6.0
+
+Dose_algo.Depsolver.check_request_using actually never used its ~criteria 
argument(!!) :exploding_head:
+--- a/src/solver/opamBuiltin0install.ml.real
 b/src/solver/opamBuiltin0install.ml.real
+@@ -115,4 +115,4 @@ let call ~criteria ?timeout:_ (preamble, universe, 
request) =
+   | Error problem ->
+ log "No solution. Solve took %.2f s" (timer ());
+ log ~level:3 "%a" (OpamConsole.slog Opam_0install_cudf.diagnostics) 
problem;
+-raise Common.CudfSolver.Unsat
++raise Dose_common.CudfSolver.Unsat
+--- a/src/solver/opamBuiltinMccs.ml.real
 b/src/solver/opamBuiltinMccs.ml.real
+@@ -42,7 +42,7 @@ let call solver_backend ext ~criteria ?timeout cudf =
+   ~verbose:OpamCoreConfig.(abs !r.debug_level >= 2)
+   ?timeout criteria cudf
+   with
+-  | None -> raise Common.CudfSolver.Unsat
++  | None -> raise Dose_common.CudfSolver.Unsat
+   | Some (preamble, univ) -> Some preamble, univ
+   | exception Mccs.Timeout -> raise (Timeout None)
+ 
+--- a/src/solver/opamBuiltinZ3.ml.real
 b/src/solver/opamBuiltinZ3.ml.real
+@@ -416,7 +416,7 @@ let call ~criteria ?timeout (preamble, universe, _ as 
cudf) =
+   match Z3.Optimize.check opt with
+   | UNSATISFIABLE ->
+ log "UNSAT";
+-raise Common.CudfSolver.Unsat
++raise Dose_common.CudfSolver.Unsat
+   | UNKNOWN ->
+ log "UNKNOWN";
+ (try
+@@ -433,7 +433,7 @@ let call ~criteria ?timeout (preamble, universe, _ as 
cudf) =
+ in
+ Some preamble, universe
+   (* with
+-   * | (Timeout | Common.CudfSolver.Unsat | Failure _) as e -> raise e
++   * | (Timeout | Dose_common.CudfSolver.Unsat | Failure _) as e -> raise e
+* | e ->
+*   OpamConsole.error "Z3 error: %s" (Printexc.to_string e);
+*   OpamConsole.errmsg "%s" (Printexc.get_backtrace ());
+--- a/src/solver/opamCudf.ml
 b/src/solver/opamCudf.ml
+@@ -24,7 +24,7 @@ let s_pinned = "pinned"
+ let s_version_lag = "version-lag"
+ 
+ let opam_invariant_package_name =
+-  Common.CudfAdd.encode "=opam-invariant"
++  Dose_common.CudfAdd.encode "=opam-invariant"
+ 
+ let opam_invariant_package_version = 1
+ 
+@@ -55,7 +55,7 @@ let cudfnv2opam ?version_map ?cudf_universe (name,v) =
+   match nv with
+   | Some nv -> nv
+   | None ->
+-let name = OpamPackage.Name.of_string (Common.CudfAdd.decode name) in
++let name = OpamPackage.Name.of_string (Dose_common.CudfAdd.decode name) in
+ match version_map with
+ | Some vmap ->

[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-solver/, dev-ml/opam-solver/files/

[Sam James]

commit: 44a31e3306b4435bc9250118a8f36c2c8b75bad1
Author: Hank Leininger  korelogic  com>
AuthorDate: Wed May  5 17:33:11 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jun  6 23:55:15 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44a31e33

dev-ml/opam-solver: patch for dose3-6.x compat

Lifted from Debian, see https://bugs.debian.org/982733

Signed-off-by: Hank Leininger  korelogic.com>
Closes: https://bugs.gentoo.org/788265
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Sam James  gentoo.org>

 .../files/debian-Port-to-Dose3-6.0.1.patch | 142 +
 dev-ml/opam-solver/opam-solver-2.0.8-r1.ebuild |  42 ++
 2 files changed, 184 insertions(+)

diff --git a/dev-ml/opam-solver/files/debian-Port-to-Dose3-6.0.1.patch 
b/dev-ml/opam-solver/files/debian-Port-to-Dose3-6.0.1.patch
new file mode 100644
index 000..a8af27416df
--- /dev/null
+++ b/dev-ml/opam-solver/files/debian-Port-to-Dose3-6.0.1.patch
@@ -0,0 +1,142 @@
+From: Mehdi Dogguy 
+Date: Sun, 28 Feb 2021 19:27:24 +0100
+Subject: Port to Dose3 6.0.1
+
+---
+ src/client/opamAdminCheck.ml   | 2 ++
+ src/client/opamAdminRepoUpgrade.ml | 2 ++
+ src/solver/opamBuiltinMccs.ml.real | 2 +-
+ src/solver/opamCudf.ml | 5 -
+ src/solver/opamCudf.mli| 4 ++--
+ src/solver/opamCudfSolver.ml   | 4 ++--
+ src/solver/opamSolver.ml   | 4 +++-
+ 7 files changed, 16 insertions(+), 7 deletions(-)
+
+diff --git a/src/client/opamAdminCheck.ml b/src/client/opamAdminCheck.ml
+index 05543a2..f23bfc4 100644
+--- a/src/client/opamAdminCheck.ml
 b/src/client/opamAdminCheck.ml
+@@ -8,6 +8,8 @@
+ (**)
+ (**)
+ 
++module Algo = Dose_algo
++
+ open OpamTypes
+ open OpamPackage.Set.Op
+ 
+diff --git a/src/client/opamAdminRepoUpgrade.ml 
b/src/client/opamAdminRepoUpgrade.ml
+index 0be53b2..635e792 100644
+--- a/src/client/opamAdminRepoUpgrade.ml
 b/src/client/opamAdminRepoUpgrade.ml
+@@ -8,6 +8,8 @@
+ (**)
+ (**)
+ 
++module Algo = Dose_algo
++
+ open OpamTypes
+ open OpamProcess.Job.Op
+ open OpamStd.Option.Op
+diff --git a/src/solver/opamBuiltinMccs.ml.real 
b/src/solver/opamBuiltinMccs.ml.real
+index ab39ab3..2b41982 100644
+--- a/src/solver/opamBuiltinMccs.ml.real
 b/src/solver/opamBuiltinMccs.ml.real
+@@ -35,7 +35,7 @@ let call solver_backend ext ~criteria ?timeout cudf =
+   ~verbose:OpamCoreConfig.(!r.debug_level >= 2)
+   ?timeout criteria cudf
+   with
+-  | None -> raise Common.CudfSolver.Unsat
++  | None -> raise Dose_common.CudfSolver.Unsat
+   | Some (preamble, univ) -> Some preamble, univ
+   | exception Mccs.Timeout -> raise Timeout
+ 
+diff --git a/src/solver/opamCudf.ml b/src/solver/opamCudf.ml
+index e07ff54..ad7293c 100644
+--- a/src/solver/opamCudf.ml
 b/src/solver/opamCudf.ml
+@@ -9,6 +9,9 @@
+ (**)
+ (**)
+ 
++module Common = Dose_common
++module Algo = Dose_algo
++
+ open OpamTypes
+ open OpamTypesBase
+ 
+@@ -634,7 +637,7 @@ let call_external_solver ~version_map univ req =
+   let r =
+ Algo.Depsolver.check_request_using
+   ~call_solver:(OpamSolverConfig.call_solver ~criteria)
+-  ~criteria ~explain:true cudf_request
++  ~explain:true cudf_request
+   in
+   log "Solver call done in %.3f" (chrono ());
+   r
+diff --git a/src/solver/opamCudf.mli b/src/solver/opamCudf.mli
+index cb8158d..c928ccf 100644
+--- a/src/solver/opamCudf.mli
 b/src/solver/opamCudf.mli
+@@ -24,7 +24,7 @@ module Map: OpamStd.MAP with type key = Cudf.package
+ module Graph: sig
+   (** Graph of cudf packages *)
+ 
+-  include module type of Algo.Defaultgraphs.PackageGraph.G
++  include module type of Dose_algo.Defaultgraphs.PackageGraph.G
+ 
+   (** Build a graph from a CUDF universe. Warning: dependency edges are 
towards
+   the dependency, which is the reverse of what happens in the action
+@@ -180,7 +180,7 @@ val string_of_vpkgs: Cudf_types.vpkg list -> string
+ 
+ val make_conflicts:
+   version_map:int package_map -> Cudf.universe ->
+-  Algo.Diagnostic.diagnosis -> ('a, conflict) result
++  Dose_algo.Diagnostic.diagnosis -> ('a, conflict) result
+ val cycle_conflict:
+   version_map:int package_map -> Cudf.universe ->
+   string list list -> ('a, conflict) result
+diff --git a/src/solver/opamCudfSolver.ml b/src/solver/opamCudfSolver.ml
+index 03486f1..2651373 100644
+--- a/src/solver/opamCudfSolver.ml
 b/src/solver/opamCudfSolver.ml
+@@ -57,7 +57,7 @@ let call_external_solver command ~criteria ?timeout (_, 
universe,_ as cudf) =
+ in