summaryrefslogtreecommitdiff
path: root/dev-ml/opam-installer
diff options
context:
space:
mode:
Diffstat (limited to 'dev-ml/opam-installer')
-rw-r--r--dev-ml/opam-installer/Manifest7
-rw-r--r--dev-ml/opam-installer/files/debian-Port-to-Dose3-6.0.1.patch142
-rw-r--r--dev-ml/opam-installer/opam-installer-2.0.9-r1.ebuild46
-rw-r--r--dev-ml/opam-installer/opam-installer-2.1.6.ebuild (renamed from dev-ml/opam-installer/opam-installer-2.0.10-r1.ebuild)25
4 files changed, 12 insertions, 208 deletions
diff --git a/dev-ml/opam-installer/Manifest b/dev-ml/opam-installer/Manifest
index 8fb174c07ab4..05580a89f15c 100644
--- a/dev-ml/opam-installer/Manifest
+++ b/dev-ml/opam-installer/Manifest
@@ -1,11 +1,8 @@
-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-full-2.0.10.tar.gz 8173617 BLAKE2B 6bf7a52835512b3de5bcf0de24f5ba3a322f718e6b590902add5ca162e449e40fa3c27cff7b042240441c031303b24cf6b1a100d7f7c3c0cc275d47e60c0bce1 SHA512 05c6bd7e08f131c910871867590a6eb95b488d943ebbb0f93212f2101f09f54dcffd5d6492c9e2edf0485e3ee681815c6353d43ef185bc934fc8afb84d02cf5f
-DIST opam-full-2.0.9.tar.gz 8029605 BLAKE2B c2ae06bdbbdbe9db270ec0027ec8d13a228f0af2ae5089476fa3a698d27e1f47abf2e3a15ecc9ca610717ba6b979b4ca76cce56c52f6592ae789b88fb5e5b68d SHA512 9f44d878a2599a876f5e5b9b7457b6f446a5e59156ed3d449dcc29e40c44df8b69da619eabdf030e45526fba4bd9a00c65dec2c36552d2e03788596b0aceee85
DIST opam-full-2.1.2.tar.gz 9442446 BLAKE2B fe5447fe8f9bcedb30bf455e93b54a37e950e2944f6f501545bdccf6d989de2da90106938efb6a12c1b9454ecefed5be9906d65a15a4d0244302ad7ccff170db SHA512 fe12aaa27168435a978c472926d40697af0a7619a529c4bfacd0b71469dfcd534f43164bc74f60f740a735d38a869ae5e87e2414119f4f3fc1826315e8a075cd
DIST opam-full-2.1.3.tar.gz 9618995 BLAKE2B 6f33e70c2e59be87b643840128b46441828d3d83888f5d321ac23d33b2fbc4d3163cb4303ac82a7f863abcc9300227bbc48bca3b8db5d6fbcebf0e6cf8869a5d SHA512 fe3a3c86335830944683a39a34a9eb385037476853ab3e2a82b8571a9e2021830cccf25cbd5bb891d239f6a47584c1b1d91aa445e6e2a814847346c5cc526ff1
-EBUILD opam-installer-2.0.10-r1.ebuild 1194 BLAKE2B 8067ca76998c8e4b38f065139096cc92dca4bb71ea31df5e5b1b79268f45865ecb172cf7c30ce762867ff3b831b8c206f5bb4cbef507d09ee09447aabc968093 SHA512 4ba15ce0bb8ded4783b536c8c0578562f21b2790172800a4d83ccbdc192051e8cc59c1f263f61ee382cc2adf8d7502161934dc1a4d63804b44a5ccea1b345c06
-EBUILD opam-installer-2.0.9-r1.ebuild 1194 BLAKE2B 7fd57adbf8d1f8d9d9b5bef83fe48a1fe40a844a3cd7f54027dd5d7e70e03ff109120a294b3e1f8c0430bbb9f6ca643be864b4aa2664baee5a4ade261b6333dc SHA512 76fc6ce77d0da8ba6773ad5f4dc21b11c7e655a8dae1c56feb630559a29043ecdca9293da3fdad6dd686675196c2293f94b49ed753a8f5b070036d99a88e88d1
+DIST opam-full-2.1.6.tar.gz 11704198 BLAKE2B 20e74551760cadf1d911e72c34502e1e7e62003f8ebc83f3b9cb46c712e13fb5f85f41421cc74b051c2e348e0c0a17f4ea34bf655f7ec48cfcdab1e0d8a57a11 SHA512 2bb24db05dc39d6e8294c10b5a6bb2dd8f675a4d56e1dc9a2e9bc576f54d14a1709005219c25586df9382897ab7ba5ea0636765410f01c06958ec59be9f14b4c
EBUILD opam-installer-2.1.2-r1.ebuild 1033 BLAKE2B c368b2cae6a3b3ae2b4f19ecd498243066b019752b6c8ed812fde3deb8d6de30328c46c0aa839434a56330fc10b08feb4e22d163fbb40b23876a37091098dfe2 SHA512 ade9467d022b3650745efffa22fd6c4eca879878c951f89d1e7fd2e8ed4a237402535e1b7e8382dfeacbffa7bb75c8c0e63f95eb24de90bb7d082ff87a21fc7b
EBUILD opam-installer-2.1.3.ebuild 1075 BLAKE2B 8c6eebaf2033a0418bde752c99ba35276d7a089b2773c8eba45c99ed78ca15b635029711bd44d5325fe5b2392563a91acd0ce5d038f287624e35c47599aaea46 SHA512 26a298278a703cfbe8e9267c6bcba2a17a22333aff459bd9abfbeddb1a929d571dbc7d6487d58c8d11ac92cb2b58448a694170001abd8134d7830d371f4a2224
+EBUILD opam-installer-2.1.6.ebuild 965 BLAKE2B 21087f8b8b847176cbadeea1b709157428128fb893fcbe1fc42df5d04baf43852961c749f339e0b4670259dc13640cc7ca36466a858f91d2d7e0041d76949845 SHA512 35684af4ae0eeff6e4aa173a01a1c402764c54d000040ef4dca47e1bc1abbe9e34eda8340956232bcccfd23816bc51eff9d7a1752cce1008ea7895d3f06bb9b2
MISC metadata.xml 308 BLAKE2B 8063e47b40e4366ef330084a189eafbb580be1231caf276960a3c3a67a34f4cb60be369e2ae75b91b379feda07fc8d7b6d9ccc5fa14c296c9dc2e8bb92d10157 SHA512 0b05ce3d4265c65f2ba372a24a59bbb46b8daa80883501a61da35aa0a8a487cd5fe0cf24cd6c089139893eb1fa970c33ef207e51772583bb137ebd38ec58eca5
diff --git a/dev-ml/opam-installer/files/debian-Port-to-Dose3-6.0.1.patch b/dev-ml/opam-installer/files/debian-Port-to-Dose3-6.0.1.patch
deleted file mode 100644
index a8af27416df1..000000000000
--- a/dev-ml/opam-installer/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-installer/opam-installer-2.0.9-r1.ebuild b/dev-ml/opam-installer/opam-installer-2.0.9-r1.ebuild
deleted file mode 100644
index eab5b13a534a..000000000000
--- a/dev-ml/opam-installer/opam-installer-2.0.9-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# We are opam
-OPAM_INSTALLER_DEP=" "
-OPAM_SKIP_VALIDATION=yes
-inherit opam
-
-DESCRIPTION="Core installer for opam packages"
-HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam"
-SRC_URI="https://github.com/ocaml/opam/releases/download/${PV}/opam-full-${PV}.tar.gz"
-S="${WORKDIR}/opam-full-${PV/_/-}"
-OPAM_INSTALLER="${S}/opam-installer"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86"
-
-# 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" )
-
-RDEPEND="
- >=dev-lang/ocaml-4.02.3:=
- dev-ml/cmdliner:=
- ~dev-ml/opam-format-${PV}:=
- >=dev-ml/dose3-6:=
-"
-DEPEND="${RDEPEND}
- dev-ml/findlib"
-
-src_configure() {
- econf \
- --prefix="${EPREFIX}/usr" \
- --with-mccs \
- --docdir="${EPREFIX}/usr/share/doc/${PF}" \
- --mandir="${EPREFIX}/usr/share/man"
-}
-
-src_compile() {
- sed -e 's/DUNE = .*$/DUNE = /' -i Makefile.config
- #passing -jX to the dune build leads to errors
- #see: https://github.com/ocaml/opam/issues/3585
- emake DUNE_PROMOTE_ARG="" -j1
-}
diff --git a/dev-ml/opam-installer/opam-installer-2.0.10-r1.ebuild b/dev-ml/opam-installer/opam-installer-2.1.6.ebuild
index a33b53110bc8..3fe873a83b63 100644
--- a/dev-ml/opam-installer/opam-installer-2.0.10-r1.ebuild
+++ b/dev-ml/opam-installer/opam-installer-2.1.6.ebuild
@@ -1,31 +1,29 @@
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# We are opam
OPAM_INSTALLER_DEP=" "
OPAM_SKIP_VALIDATION=yes
-inherit opam
+inherit dune
DESCRIPTION="Core installer for opam packages"
HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam"
SRC_URI="https://github.com/ocaml/opam/releases/download/${PV}/opam-full-${PV}.tar.gz"
S="${WORKDIR}/opam-full-${PV/_/-}"
-OPAM_INSTALLER="${S}/opam-installer"
+OPAM_INSTALLER="${S}/_build/install/default/bin/opam-installer"
LICENSE="LGPL-2.1"
SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86"
-
-# 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" )
+KEYWORDS="amd64 arm ~arm64 ~ppc ppc64 ~riscv x86"
+IUSE="+ocamlopt"
+RESTRICT="test" # sandbox not working
RDEPEND="
- >=dev-lang/ocaml-4.02.3:=
- dev-ml/cmdliner:=
- ~dev-ml/opam-format-${PV}:=
- >=dev-ml/dose3-6:=
+ dev-ml/cmdliner:=[ocamlopt?]
+ ~dev-ml/opam-${PV}:=[ocamlopt?]
+ dev-ml/dose3:=[ocamlopt?]
"
DEPEND="${RDEPEND}
dev-ml/findlib"
@@ -39,8 +37,5 @@ src_configure() {
}
src_compile() {
- sed -e 's/DUNE = .*$/DUNE = /' -i Makefile.config
- #passing -jX to the dune build leads to errors
- #see: https://github.com/ocaml/opam/issues/3585
- emake DUNE_PROMOTE_ARG="" -j1
+ dune-compile ${PN}
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-28 13:18:17 +0000