dev-ml/eliom: Fix build with lwt3.

Package-Manager: Portage-2.3.5, Repoman-2.3.2
This commit is contained in:
Alexis Ballier
2017-04-12 20:51:46 +02:00
parent aeb712378d
commit 133e85b7d6
3 changed files with 51 additions and 1 deletions

View File

@@ -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

View File

@@ -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}

View File

@@ -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)