From c431a44e3cfa102e5ef2c9d6bbac48e28c9b15cb Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 20 Aug 2024 12:25:59 +0100 Subject: gentoo auto-resync : 20:08:2024 - 12:25:59 --- dev-ml/opam-solver/Manifest | 1 - .../files/debian-Port-to-Dose3-6.0.1.patch | 142 --------------------- 2 files changed, 143 deletions(-) delete mode 100644 dev-ml/opam-solver/files/debian-Port-to-Dose3-6.0.1.patch (limited to 'dev-ml/opam-solver') diff --git a/dev-ml/opam-solver/Manifest b/dev-ml/opam-solver/Manifest index 9cc5ee7f66bc..3b1b30c14396 100644 --- a/dev-ml/opam-solver/Manifest +++ b/dev-ml/opam-solver/Manifest @@ -1,4 +1,3 @@ -AUX debian-Port-to-Dose3-6.0.1.patch 5223 BLAKE2B 8fada8b358cfae3aab9f6b8f0554894f55081197760a08b544229fdcc9d74434c1408cf72a8bb1d4280d11ef94d593ebb54a8f656617d99191d3576d02556793 SHA512 969c79a0552e0ea2388f732ca266d07b4c2a5a6945bd75daa2a435340ffbd8d87d2ada39dbab9cb364b2ad918f60600a59cf1fc06290a3dcbb68568c52fc9c7d DIST opam-2.1.0-dose3-6.patch.xz 5896 BLAKE2B f605064ebae7d327895729962a345a3c679519895aa2568f0c2d199d4ba9d6ae948a4fc418cfd26cc65079eb6ef3545f24a35e08c969d215529664a80d0c9147 SHA512 e00da74d7baef62319e884e3a05112bcf86a02d887c274bd15fb0d15bb8198e9a37a421f388bec3fce198e7a1b4d37024b18609dc65978c6ee8a7889df9bd608 DIST opam-2.1.2.tar.gz 818848 BLAKE2B ffb50f3cf1421aa9bff6877d636a3d1d1cc2c2e3961ecd60fcae8a35b069c8d22e7a36bf17cb8166533621a3c85a82195fd3fa646b2fd8dcea9e626b61d5b86c SHA512 bea6f75728a6ef25bcae4f8903dde7a297df7186208dccacb3f58bd6a0caec551c11b79e8544f0983feac038971dbe49481fc405a5962973a5f56ec811abe396 DIST opam-2.1.3.tar.gz 832450 BLAKE2B c5e50c0a41b7197bc7645eaef0d8cba79c978b4432fc824aa6a4280df65ec7d59df52a22b76877da4949c8562a5fecb8da2a179ca67bd312bf9a514961bf4444 SHA512 040e4f58f93e962ff422617ce0d35ed45dd86921a9aac3505914c33dd942d0e5e5771e7e1774046504f9aa84f32bc4fbd6ac7720fbea862d48bf1ca29e02cefc 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 deleted file mode 100644 index a8af27416df1..000000000000 --- a/dev-ml/opam-solver/files/debian-Port-to-Dose3-6.0.1.patch +++ /dev/null @@ -1,142 +0,0 @@ -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 - OpamFilename.remove solver_in; - if not (OpamFilename.exists solver_out) then -- raise (Common.CudfSolver.Error "no output") -+ raise (Dose_common.CudfSolver.Error "no output") - else if - (let ic = OpamFilename.open_in solver_out in - try -@@ -65,7 +65,7 @@ let call_external_solver command ~criteria ?timeout (_, universe,_ as cudf) = - i = "FAIL" - with End_of_file -> close_in ic; false) - then -- raise Common.CudfSolver.Unsat -+ raise Dose_common.CudfSolver.Unsat - else - let r = - Cudf_parser.load_solution_from_file -diff --git a/src/solver/opamSolver.ml b/src/solver/opamSolver.ml -index 3748e75..bbf995f 100644 ---- a/src/solver/opamSolver.ml -+++ b/src/solver/opamSolver.ml -@@ -9,6 +9,8 @@ - (* *) - (**************************************************************************) - -+module Algo = Dose_algo -+ - open OpamTypes - open OpamTypesBase - open OpamPackage.Set.Op -@@ -84,7 +86,7 @@ let cudf_versions_map universe packages = - pmap OpamPackage.Map.empty - - let name_to_cudf name = -- Common.CudfAdd.encode (OpamPackage.Name.to_string name) -+ Dose_common.CudfAdd.encode (OpamPackage.Name.to_string name) - - let constraint_to_cudf version_map name (op,v) = - let nv = OpamPackage.create name v in -- cgit v1.2.3