dev-ml/opam: remove old

Package-Manager: Portage-2.3.3, Repoman-2.3.1

2 files changed, 0 insertions, 102 deletions

diff --git a/dev-ml/opam/files/0001-Port-to-Dose3-4.0.1.patch b/dev-ml/opam/files/0001-Port-to-Dose3-4.0.1.patch
deleted file mode 100644
index a06733cc3b4c..000000000000
--- a/dev-ml/opam/files/0001-Port-to-Dose3-4.0.1.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From: Mehdi Dogguy <mehdi@debian.org>
-Date: Mon, 14 Sep 2015 23:11:00 +0200
-Subject: Port to Dose3 4.0.1
-
----
- src/core/opamCompiler.ml   | 2 +-
- src/core/opamFilter.ml     | 2 +-
- src/core/opamPackage.ml    | 2 +-
- src/core/opamVersion.ml.in | 2 +-
- src/solver/opamCudf.ml     | 2 +-
- 5 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/src/core/opamCompiler.ml b/src/core/opamCompiler.ml
-index 4178311..c7beb93 100644
---- a/src/core/opamCompiler.ml
-+++ b/src/core/opamCompiler.ml
-@@ -30,7 +30,7 @@ module Version = struct
- 
-   type constr = (OpamFormula.relop * t) OpamFormula.formula
- 
--  let compare v1 v2 = Debian.Version.compare (to_string v1) (to_string v2)
-+  let compare v1 v2 = Versioning.Debian.compare (to_string v1) (to_string v2)
- 
-   let eval_relop relop v1 v2 = OpamFormula.check_relop relop (compare v1 v2)
- 
-diff --git a/src/core/opamFilter.ml b/src/core/opamFilter.ml
-index 0e919e7..ebce090 100644
---- a/src/core/opamFilter.ml
-+++ b/src/core/opamFilter.ml
-@@ -203,7 +203,7 @@ let rec reduce_aux env = function
-      | FUndef, _ | _, FUndef -> FUndef
-      | e,f ->
-        FBool (OpamFormula.check_relop relop
--                (Debian.Version.compare (value_string e) (value_string f))))
-+                (Versioning.Debian.compare (value_string e) (value_string f))))
-   | FAnd (e,f) -> logop2 (&&) false (reduce env e) (reduce env f)
-   | FOr (e,f) -> logop2 (||) true (reduce env e) (reduce env f)
-   | FNot e -> logop1 not (reduce env e)
-diff --git a/src/core/opamPackage.ml b/src/core/opamPackage.ml
-index 56605bb..8390896 100644
---- a/src/core/opamPackage.ml
-+++ b/src/core/opamPackage.ml
-@@ -29,7 +29,7 @@ module Version = struct
- 
-   let of_string x = x
- 
--  let compare = Debian.Version.compare
-+  let compare = Versioning.Debian.compare
- 
-   let to_json x =
-     `String (to_string x)
-diff --git a/src/core/opamVersion.ml.in b/src/core/opamVersion.ml.in
-index 3c9fc92..ead47b8 100644
---- a/src/core/opamVersion.ml.in
-+++ b/src/core/opamVersion.ml.in
-@@ -27,7 +27,7 @@ let compare v w =
-   let cut s = match OpamMisc.cut_at s '-' with
-     | Some (s,_) -> s
-     | None -> s in
--  Debian.Version.compare (cut v) (cut w)
-+  Versioning.Debian.compare (cut v) (cut w)
- 
- module O = struct
-   type t = string
-diff --git a/src/solver/opamCudf.ml b/src/solver/opamCudf.ml
-index 62ea551..f790352 100644
---- a/src/solver/opamCudf.ml
-+++ b/src/solver/opamCudf.ml
-@@ -611,7 +611,7 @@ let check_cudf_version =
-           `Compat
-         | s::_ ->
-           match OpamMisc.split s ' ' with
--          | "aspcud"::_::v::_ when Debian.Version.compare v "1.9" >= 0 ->
-+          | "aspcud"::_::v::_ when Versioning.Debian.compare v "1.9" >= 0 ->
-             log "Solver is aspcud > 1.9: using latest version criteria";
-             `Latest
-           | _ ->
diff --git a/dev-ml/opam/files/no-insecure.patch b/dev-ml/opam/files/no-insecure.patch
deleted file mode 100644
index aebd5b29eebe..000000000000
--- a/dev-ml/opam/files/no-insecure.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Description: remove insecure / no-check-certificate flags (see mail on opam-devel, #55 #2006)
-Author: Hannes Mehnert <hannes@mehnert.org>
-Applied-Upstream: 3d43295df3bb9e67e60801d319bf82c2c8a84d24
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/src/core/opamSystem.ml
-+++ b/src/core/opamSystem.ml
-@@ -694,7 +694,7 @@
-   let retry = string_of_int OpamGlobals.download_retry in
-   let wget ~compress:_ ?checksum:_ dir src =
-     let wget_args = [
--      "--content-disposition"; "--no-check-certificate";
-+      "--content-disposition";
-       "-t"; retry;
-       src
-     ] in
-@@ -704,7 +704,7 @@
-   in
-   let curl command ~compress ?checksum:_ dir src =
-     let curl_args = [
--      "--write-out"; "%{http_code}\\n"; "--insecure";
-+      "--write-out"; "%{http_code}\\n";
-       "--retry"; retry; "--retry-delay"; "2";
-     ] @ (if compress then ["--compressed"] else []) @ [
-         "-OL"; src