summaryrefslogtreecommitdiff
path: root/dev-ml/opam-state
diff options
context:
space:
mode:
Diffstat (limited to 'dev-ml/opam-state')
-rw-r--r--dev-ml/opam-state/Manifest5
-rw-r--r--dev-ml/opam-state/files/debian-Port-to-Dose3-6.0.1.patch142
-rw-r--r--dev-ml/opam-state/opam-state-2.0.10.ebuild38
-rw-r--r--dev-ml/opam-state/opam-state-2.0.9.ebuild38
4 files changed, 0 insertions, 223 deletions
diff --git a/dev-ml/opam-state/Manifest b/dev-ml/opam-state/Manifest
index 007ec086299c..ea31c7f2b2f7 100644
--- a/dev-ml/opam-state/Manifest
+++ b/dev-ml/opam-state/Manifest
@@ -1,11 +1,6 @@
-AUX debian-Port-to-Dose3-6.0.1.patch 5223 BLAKE2B 8fada8b358cfae3aab9f6b8f0554894f55081197760a08b544229fdcc9d74434c1408cf72a8bb1d4280d11ef94d593ebb54a8f656617d99191d3576d02556793 SHA512 969c79a0552e0ea2388f732ca266d07b4c2a5a6945bd75daa2a435340ffbd8d87d2ada39dbab9cb364b2ad918f60600a59cf1fc06290a3dcbb68568c52fc9c7d
-DIST opam-2.0.10.tar.gz 641739 BLAKE2B 7cd201fe6bed2ae81fc8d9d0a7063b284621e579713c2b8672a5ea37cd7516a030367664823c75594a789136ffe5b313818fa120fb64e499b8276706700df776 SHA512 49218a14c3b7e2f47052c1fb6907b54086f5af4adb43d120065c77f2c573d72136ac64f55f577a613eb43ebe29fbe14f9ac0e25756209ca7a572aa35a4410a5d
-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.2.tar.gz 818848 BLAKE2B ffb50f3cf1421aa9bff6877d636a3d1d1cc2c2e3961ecd60fcae8a35b069c8d22e7a36bf17cb8166533621a3c85a82195fd3fa646b2fd8dcea9e626b61d5b86c SHA512 bea6f75728a6ef25bcae4f8903dde7a297df7186208dccacb3f58bd6a0caec551c11b79e8544f0983feac038971dbe49481fc405a5962973a5f56ec811abe396
DIST opam-2.1.3.tar.gz 832450 BLAKE2B c5e50c0a41b7197bc7645eaef0d8cba79c978b4432fc824aa6a4280df65ec7d59df52a22b76877da4949c8562a5fecb8da2a179ca67bd312bf9a514961bf4444 SHA512 040e4f58f93e962ff422617ce0d35ed45dd86921a9aac3505914c33dd942d0e5e5771e7e1774046504f9aa84f32bc4fbd6ac7720fbea862d48bf1ca29e02cefc
-EBUILD opam-state-2.0.10.ebuild 893 BLAKE2B a8c3a159b441a579c2f69eec37b00c280495c28763f435540b75bf99dda3084adbb2ca6f519f721aa459ad8353d99143c2599609337298b004b10622ea778c8a SHA512 c6182c6546dd1ab5361a75ec6cedaff9c8d6c743c5c2d120755840097f4742c58e7c5ed230976700f64f2ade80c080a031fe3bad541c32f75836649b869b68f7
-EBUILD opam-state-2.0.9.ebuild 893 BLAKE2B 8e1760f7eea15b611247e19cb438fbc411333402ffb6c28d2be301b7e5aa2befb3b45853ea556c30554fa1da8f6657c489ed0d818abb03dd8d8715f637599090 SHA512 717ec35c51b7298f8a6520a68cd46e4c74da1d5a2743a904fba5778fa4e8e77f38aae86424a84bb9b5cd5e5d6f72c44430c561557829bcf4972179b486989363
EBUILD opam-state-2.1.2.ebuild 886 BLAKE2B edc9fdb776256415d9735e06296bf57bdebd3217ddfd8d229fbb9905dc4714371ecd220c879558e34ca73b6d20f78265d071f461825a0567e7a8e6ddd4b67a9e SHA512 795325ec954ec0e7227923e6839a7bc156a3b6380bb5e39d84956ddaa16e63952b025726e99e55bfe1d03166ef841b11e7fc135c92e2f11bdeb769549618f591
EBUILD opam-state-2.1.3.ebuild 890 BLAKE2B fb0ccf6c0e5d7917ec77ee0bbe4e7141e91efdec53fc02df0702c511d2a818ab2114499ab76736d8e17289fc2342ef1be5b96b059200d47932a91fba98e9c1e1 SHA512 0d8d1e923ca1bfc81e41f2c3b500ded46a5069474f2af25f5603404cf86a2c3ad33bb47677167d55c06df78988391e7394be272888f9d934a1a81cfd4193cbb5
MISC metadata.xml 308 BLAKE2B 8063e47b40e4366ef330084a189eafbb580be1231caf276960a3c3a67a34f4cb60be369e2ae75b91b379feda07fc8d7b6d9ccc5fa14c296c9dc2e8bb92d10157 SHA512 0b05ce3d4265c65f2ba372a24a59bbb46b8daa80883501a61da35aa0a8a487cd5fe0cf24cd6c089139893eb1fa970c33ef207e51772583bb137ebd38ec58eca5
diff --git a/dev-ml/opam-state/files/debian-Port-to-Dose3-6.0.1.patch b/dev-ml/opam-state/files/debian-Port-to-Dose3-6.0.1.patch
deleted file mode 100644
index a8af27416df1..000000000000
--- a/dev-ml/opam-state/files/debian-Port-to-Dose3-6.0.1.patch
+++ /dev/null
@@ -1,142 +0,0 @@
-From: Mehdi Dogguy <mehdi@debian.org>
-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
diff --git a/dev-ml/opam-state/opam-state-2.0.10.ebuild b/dev-ml/opam-state/opam-state-2.0.10.ebuild
deleted file mode 100644
index 0c7a4142bd32..000000000000
--- a/dev-ml/opam-state/opam-state-2.0.10.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit dune
-
-DESCRIPTION="opam state libraries"
-HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam"
-SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz"
-S="${WORKDIR}/opam-${PV/_/-}"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86"
-IUSE="+ocamlopt"
-RESTRICT="test"
-
-RDEPEND="
- dev-ml/re:=
- dev-ml/opam-file-format:=
- ~dev-ml/opam-repository-${PV}:=
-"
-DEPEND="${RDEPEND}"
-
-# Cherry-picked from https://deb.debian.org/debian/pool/main/o/opam/opam_2.0.8-1.debian.tar.xz
-PATCHES=( "${FILESDIR}/debian-Port-to-Dose3-6.0.1.patch" )
-
-src_prepare() {
- default
- cat <<- EOF >> "${S}/dune"
- (env
- (dev
- (flags (:standard -warn-error -3-9-33)))
- (release
- (flags (:standard -warn-error -3-9-33))))
- EOF
-}
diff --git a/dev-ml/opam-state/opam-state-2.0.9.ebuild b/dev-ml/opam-state/opam-state-2.0.9.ebuild
deleted file mode 100644
index 7ae602accc10..000000000000
--- a/dev-ml/opam-state/opam-state-2.0.9.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit dune
-
-DESCRIPTION="opam state libraries"
-HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam"
-SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz"
-S="${WORKDIR}/opam-${PV/_/-}"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86"
-IUSE="+ocamlopt"
-RESTRICT="test"
-
-RDEPEND="
- dev-ml/re:=
- dev-ml/opam-file-format:=
- ~dev-ml/opam-repository-${PV}:=
-"
-DEPEND="${RDEPEND}"
-
-# Cherry-picked from https://deb.debian.org/debian/pool/main/o/opam/opam_2.0.8-1.debian.tar.xz
-PATCHES=( "${FILESDIR}/debian-Port-to-Dose3-6.0.1.patch" )
-
-src_prepare() {
- default
- cat <<- EOF >> "${S}/dune"
- (env
- (dev
- (flags (:standard -warn-error -3-9-33)))
- (release
- (flags (:standard -warn-error -3-9-33))))
- EOF
-}
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-18 06:03:12 +0000