summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2017-04-12 20:51:46 +0200
committerAlexis Ballier <aballier@gentoo.org>2017-04-12 21:20:25 +0200
commit133e85b7d6febf3cf64a03dcca57c97974d255d7 (patch)
tree77db75de5d1a2755e7d48853d230bcdc5557b852
parentwww-servers/ocsigenserver: Fix build with lwt3. (diff)
downloadgentoo-133e85b7d6febf3cf64a03dcca57c97974d255d7.tar.gz
gentoo-133e85b7d6febf3cf64a03dcca57c97974d255d7.tar.bz2
gentoo-133e85b7d6febf3cf64a03dcca57c97974d255d7.zip
dev-ml/eliom: Fix build with lwt3.
Package-Manager: Portage-2.3.5, Repoman-2.3.2
-rw-r--r--dev-ml/eliom/eliom-6.2.0.ebuild5
-rw-r--r--dev-ml/eliom/eliom-9999.ebuild3
-rw-r--r--dev-ml/eliom/files/lwt3.patch44
3 files changed, 51 insertions, 1 deletions
diff --git a/dev-ml/eliom/eliom-6.2.0.ebuild b/dev-ml/eliom/eliom-6.2.0.ebuild
index 49663b031da..b69350aae03 100644
--- a/dev-ml/eliom/eliom-6.2.0.ebuild
+++ b/dev-ml/eliom/eliom-6.2.0.ebuild
@@ -32,12 +32,17 @@ RDEPEND=">=dev-lang/ocaml-4.03:=[ocamlopt?]
dev-ml/react:=
dev-ml/ocaml-ssl:=
>=dev-ml/lwt-2.5.0:=
+ dev-ml/lwt_react:=
dev-ml/camlp4:=
ppx? ( >=dev-ml/ppx_tools-0.99.3:= )"
DEPEND="${RDEPEND}
dev-ml/ocamlbuild
dev-ml/opam"
+src_prepare() {
+ epatch "${FILESDIR}/lwt3.patch"
+}
+
src_compile() {
if use ocamlopt ; then
emake PPX=$(usex ppx true false) all
diff --git a/dev-ml/eliom/eliom-9999.ebuild b/dev-ml/eliom/eliom-9999.ebuild
index 74e7e33453c..42b48b1abdd 100644
--- a/dev-ml/eliom/eliom-9999.ebuild
+++ b/dev-ml/eliom/eliom-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -32,6 +32,7 @@ RDEPEND=">=dev-lang/ocaml-4.03:=[ocamlopt?]
dev-ml/react:=
dev-ml/ocaml-ssl:=
>=dev-ml/lwt-2.5.0:=
+ dev-ml/lwt_react:=
dev-ml/camlp4:=
ppx? ( >=dev-ml/ppx_tools-0.99.3:= )"
DEPEND="${RDEPEND}
diff --git a/dev-ml/eliom/files/lwt3.patch b/dev-ml/eliom/files/lwt3.patch
new file mode 100644
index 00000000000..6b8d993fb68
--- /dev/null
+++ b/dev-ml/eliom/files/lwt3.patch
@@ -0,0 +1,44 @@
+Index: eliom-6.2.0/pkg/META
+===================================================================
+--- eliom-6.2.0.orig/pkg/META
++++ eliom-6.2.0/pkg/META
+@@ -13,7 +13,7 @@ package "server" (
+ react,
+ reactiveData,
+ tyxml,
+- lwt.react,
++ lwt_react,
+ cryptokit,
+ reactiveData"
+ archive(byte) = "server.cma"
+@@ -49,7 +49,7 @@ package "client" (
+ js_of_ocaml.tyxml,
+ js_of_ocaml.log,
+ js_of_ocaml.weak,
+- lwt.react,
++ lwt_react,
+ react,
+ reactiveData,
+ tyxml.functor"
+Index: eliom-6.2.0/src/_tags
+===================================================================
+--- eliom-6.2.0.orig/src/_tags
++++ eliom-6.2.0/src/_tags
+@@ -11,7 +11,7 @@ true:keep_locs
+
+ <lib/server/*.ml{,i}>:thread
+ <lib/server/*.ml{,i}>:package(lwt,ocsigenserver,ocsigenserver.ext,tyxml.functor)
+-<lib/server/*.ml{,i}>:package(react,js_of_ocaml)
++<lib/server/*.ml{,i}>:package(lwt_react,react,js_of_ocaml)
+
+ <lib/server/*.ml{,i}>:package(js_of_ocaml.deriving.ppx)
+
+@@ -24,7 +24,7 @@ true:keep_locs
+ <lib/client/*.ml{,i}>: eliom_ppx
+ <lib/client/*.ml{,i}>:package(ocsigenserver.cookies,ocsigenserver.polytables,ocsigenserver.baselib.base)
+ <lib/client/*.ml{,i}>:package(deriving.runtime,js_of_ocaml.deriving)
+-<lib/client/*.ml{,i}>:package(lwt.react,tyxml.functor,js_of_ocaml.tyxml)
++<lib/client/*.ml{,i}>:package(lwt_react,tyxml.functor,js_of_ocaml.tyxml)
+ <lib/client/*.ml{,i}>:package(react,js_of_ocaml,reactiveData)
+
+ <lib/client/*.ml{,i}>:package(js_of_ocaml.deriving.ppx)