From 11416db9802ed80d880123008461de843f8f9222 Mon Sep 17 00:00:00 2001
From: Calascibetta Romain <romain.calascibetta@gmail.com>
Date: Mon, 20 Apr 2020 17:17:41 +0200
Subject: [PATCH] Update OPAM files according new conduit

---
 conduit-lwt.opam    | 14 ++++++++------
 conduit-mirage.opam | 21 +++-----------------
 conduit-tls.opam    | 47 +++++++++++++++++++++++++++++++++++++++++++++
 conduit.opam        | 12 ++++--------
 4 files changed, 62 insertions(+), 32 deletions(-)
 create mode 100644 conduit-tls.opam

diff --git a/conduit-lwt.opam b/conduit-lwt.opam
index 8482231f..a00e7a7d 100644
--- a/conduit-lwt.opam
+++ b/conduit-lwt.opam
@@ -2,19 +2,21 @@ opam-version: "2.0"
 maintainer: "anil@recoil.org"
 authors: [
   "Anil Madhavapeddy" "Thomas Leonard" "Thomas Gazagnaire" "Rudi Grinberg"
+  "Romain Calascibetta"
 ]
 license: "ISC"
 tags: "org:mirage"
 homepage: "https://github.com/mirage/ocaml-conduit"
 bug-reports: "https://github.com/mirage/ocaml-conduit/issues"
 depends: [
-  "ocaml" {>= "4.03.0"}
+  "ocaml" {>= "4.07.0"}
   "dune"
-  "base-unix"
-  "ppx_sexp_conv" {>="v0.12.0"}
-  "sexplib"
-  "conduit" {=version}
-  "lwt" {>= "3.0.0"}
+  "conduit"
+  "cstruct"
+  "lwt"
+]
+depopts: [
+  "conduit-tls"
 ]
 build: [
   ["dune" "subst"] {pinned}
diff --git a/conduit-mirage.opam b/conduit-mirage.opam
index 35c38dfd..3da87a2a 100644
--- a/conduit-mirage.opam
+++ b/conduit-mirage.opam
@@ -8,27 +8,12 @@ bug-reports: "https://github.com/mirage/ocaml-conduit/issues"
 depends: [
   "ocaml" {>= "4.07.0"}
   "dune"
-  "ppx_sexp_conv" {>="v0.12.0"}
-  "sexplib"
-  "cstruct" {>= "3.0.0"}
-  "mirage-stack" {>= "2.0.0"}
-  "mirage-clock" {>= "3.0.0"}
-  "mirage-flow" {>= "2.0.0"}
-  "mirage-flow-combinators" {>= "2.0.0"}
-  "mirage-random" {>= "2.0.0"}
-  "dns-client" {>= "4.1.0"}
   "conduit-lwt"
-  "vchan" {>= "5.0.0"}
-  "xenstore"
-  "tls" {>= "0.11.0"}
-  "tls-mirage" {>= "0.11.0"}
-  "ipaddr" {>= "3.0.0"}
-  "ipaddr-sexp"
 ]
-conflicts: [
-  "mirage-conduit"
+depopts: [
+  "conduit-tls"
+  "tcpip"
 ]
-
 build: [
   ["dune" "subst"] {pinned}
   ["dune" "build" "-p" name "-j" jobs]
diff --git a/conduit-tls.opam b/conduit-tls.opam
new file mode 100644
index 00000000..4b5fda62
--- /dev/null
+++ b/conduit-tls.opam
@@ -0,0 +1,47 @@
+opam-version: "2.0"
+maintainer: "anil@recoil.org"
+authors: [
+  "Anil Madhavapeddy" "Thomas Leonard" "Thomas Gazagnaire" "Rudi Grinberg"
+  "Romain Calascibetta"
+]
+license: "ISC"
+tags: "org:mirage"
+homepage: "https://github.com/mirage/ocaml-conduit"
+doc: "https://mirage.github.io/ocaml-conduit/"
+bug-reports: "https://github.com/mirage/ocaml-conduit/issues"
+depends: [
+  "ocaml" {>= "4.07.0"}
+  "dune"
+  "conduit"
+  "ke"
+  "tls"
+  "logs"
+  "bigstringaf"
+]
+build: [
+  ["dune" "subst"] {pinned}
+  ["dune" "build" "-p" name "-j" jobs]
+]
+dev-repo: "git+https://github.com/mirage/ocaml-conduit.git"
+synopsis: "A network connection establishment library"
+description: """
+The `conduit` library takes care of establishing and listening for 
+TCP and SSL/TLS connections for the Lwt and Async libraries.
+
+The reason this library exists is to provide a degree of abstraction
+from the precise SSL library used, since there are a variety of ways
+to bind to a library (e.g. the C FFI, or the Ctypes library), as well
+as well as which library is used (just OpenSSL for now).
+
+By default, OpenSSL is used as the preferred connection library, but
+you can force the use of the pure OCaml TLS stack by setting the
+environment variable `CONDUIT_TLS=native` when starting your program.
+
+The useful opam packages available that extend this library are:
+
+- `conduit`: the main `Conduit` module
+- `conduit-lwt`: the portable Lwt implementation
+- `conduit-lwt-unix`: the Lwt/Unix implementation
+- `conduit-async` the Jane Street Async implementation
+- `conduit-mirage`: the MirageOS compatible implementation
+"""
diff --git a/conduit.opam b/conduit.opam
index aab1e9fe..e627c365 100644
--- a/conduit.opam
+++ b/conduit.opam
@@ -2,6 +2,7 @@ opam-version: "2.0"
 maintainer: "anil@recoil.org"
 authors: [
   "Anil Madhavapeddy" "Thomas Leonard" "Thomas Gazagnaire" "Rudi Grinberg"
+  "Romain Calascibetta"
 ]
 license: "ISC"
 tags: "org:mirage"
@@ -9,15 +10,10 @@ homepage: "https://github.com/mirage/ocaml-conduit"
 doc: "https://mirage.github.io/ocaml-conduit/"
 bug-reports: "https://github.com/mirage/ocaml-conduit/issues"
 depends: [
-  "ocaml" {>= "4.03.0"}
+  "ocaml" {>= "4.07.0"}
   "dune"
-  "ppx_sexp_conv" {>="v0.12.0"}
-  "sexplib"
-  "astring"
-  "uri"
-  "logs" {>= "0.5.0"}
-  "ipaddr" {>= "4.0.0"}
-  "ipaddr-sexp"
+  "domain-name"
+  "stdlib-shims"
 ]
 build: [
   ["dune" "subst"] {pinned}