Backport upstream fix to build with lwt 2.5. Install manpages in the proper location.

(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 160F534A)

3 files changed, 138 insertions, 1 deletions

diff --git a/dev-ml/eliom/ChangeLog b/dev-ml/eliom/ChangeLog
index cb4d64860b8f..732bd3f352e1 100644
--- a/dev-ml/eliom/ChangeLog
+++ b/dev-ml/eliom/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-ml/eliom
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/eliom/ChangeLog,v 1.7 2015/06/07 09:11:15 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/eliom/ChangeLog,v 1.8 2015/07/16 13:22:23 aballier Exp $
+
+*eliom-4.1.0-r1 (16 Jul 2015)
+
+  16 Jul 2015; Alexis Ballier <aballier@gentoo.org> +eliom-4.1.0-r1.ebuild,
+  +files/lwt.patch:
+  Backport upstream fix to build with lwt 2.5. Install manpages in the proper
+  location.
 
   07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Add github to remote-id in metadata.xml
diff --git a/dev-ml/eliom/eliom-4.1.0-r1.ebuild b/dev-ml/eliom/eliom-4.1.0-r1.ebuild
new file mode 100644
index 000000000000..73896adfdd3f
--- /dev/null
+++ b/dev-ml/eliom/eliom-4.1.0-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/eliom/eliom-4.1.0-r1.ebuild,v 1.1 2015/07/16 13:22:23 aballier Exp $
+
+EAPI=5
+
+inherit eutils multilib findlib
+
+DESCRIPTION="A web framework to program client/server applications"
+HOMEPAGE="http://ocsigen.org/eliom/"
+SRC_URI="https://github.com/ocsigen/eliom/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="doc +ocamlopt"
+
+DEPEND=">=dev-lang/ocaml-4.00:=[ocamlopt?]
+	>=dev-ml/js_of_ocaml-2.5-r1:=
+	>=www-servers/ocsigenserver-2.5:=
+	>=dev-ml/tyxml-3.3:=
+	>=dev-ml/deriving-0.6:=
+	dev-ml/reactiveData:=
+	dev-ml/ocaml-ipaddr:=
+	dev-ml/react:=
+	dev-ml/ocaml-ssl:=
+	>=dev-ml/lwt-2.5.0:=
+	dev-ml/calendar:="
+RDEPEND="${DEPEND}
+	dev-ml/opam"
+
+src_prepare() {
+	epatch "${FILESDIR}/lwt.patch"
+}
+
+src_compile() {
+	if use ocamlopt ; then
+		emake all
+	else
+		emake byte
+	fi
+	use doc && emake doc
+	emake man
+}
+
+src_install() {
+	opam-installer \
+		--prefix="${ED}/usr" \
+		--libdir="${D}/$(ocamlc -where)" \
+		--docdir="${ED}/usr/share/doc/${PF}" \
+		--mandir="${ED}/usr/share/man" \
+		|| die
+	dodoc CHANGES README
+	if use doc ; then
+		docinto client/html
+		dodoc -r _build/src/lib/client/api.docdir/*
+		docinto server/html
+		dodoc -r _build/src/lib/server/api.docdir/*
+	fi
+}
diff --git a/dev-ml/eliom/files/lwt.patch b/dev-ml/eliom/files/lwt.patch
new file mode 100644
index 000000000000..8f3546ec1376
--- /dev/null
+++ b/dev-ml/eliom/files/lwt.patch
@@ -0,0 +1,70 @@
+commit 107338c381b6a489c24c2dc9874de028a2cd08a3
+Author: Drup <drupyog@zoho.com>
+Date:   Fri Jan 16 16:42:33 2015 +0100
+
+    Remove dependency to Lwt_util.
+
+diff --git a/src/lib/eliom_state.server.ml b/src/lib/eliom_state.server.ml
+index f7ea0ca..3523fc3 100644
+--- a/src/lib/eliom_state.server.ml
++++ b/src/lib/eliom_state.server.ml
+@@ -561,7 +561,7 @@ let set_persistent_data_session_group ?set_max
+     ?set_max
+     (fst sitedata.Eliom_common.max_persistent_data_sessions_per_group)
+     c.Eliom_common.pc_value !grp n in
+-  lwt () = Lwt_util.iter
++  lwt () = Lwt_list.iter_p
+     (Eliommod_persess.close_persistent_state2
+        ~scope:(scope:>Eliom_common.user_scope) sitedata None) l in
+   grp := n;
+diff --git a/src/lib/server/eliommod_gc.ml b/src/lib/server/eliommod_gc.ml
+index 5655ddf..6ab298d 100644
+--- a/src/lib/server/eliommod_gc.ml
++++ b/src/lib/server/eliommod_gc.ml
+@@ -135,7 +135,7 @@ let gc_timeouted_services now tables =
+               Lwt.return ()
+         end
+   in
+-  Lwt_util.iter_serial
++  Lwt_list.iter_s
+     (fun (_gen, _prio, t) -> empty_one t) tables.Eliom_common.table_services
+   >>= fun () ->
+   tables.Eliom_common.table_services <-
+diff --git a/src/lib/server/eliommod_pagegen.ml b/src/lib/server/eliommod_pagegen.ml
+index 1e2d0b4..e0a96a6 100644
+--- a/src/lib/server/eliommod_pagegen.ml
++++ b/src/lib/server/eliommod_pagegen.ml
+@@ -99,7 +99,6 @@ let update_cookie_table ?now sitedata (ci, sci) =
+ 
+ 
+   (* Update persistent expiration date, user timeout and value *)
+-  (* Lwt_util.iter *)
+     Eliom_common.Full_state_name_table.fold
+ 
+       (fun name v thr ->
+diff --git a/src/lib/server/eliommod_persess.ml b/src/lib/server/eliommod_persess.ml
+index 18c0f5b..9e25906 100644
+--- a/src/lib/server/eliommod_persess.ml
++++ b/src/lib/server/eliommod_persess.ml
+@@ -152,7 +152,7 @@ let rec find_or_create_persistent_cookie_
+       ?set_max:set_max_in_group
+       (fst sitedata.Eliom_common.max_persistent_data_sessions_per_group)
+       c fullsessgrp >>= fun l ->
+-    Lwt_util.iter (close_persistent_state2
++    Lwt_list.iter_p (close_persistent_state2
+                      ~scope:(cookie_scope :> Eliom_common.user_scope)
+                      sitedata None) l
+     >>= fun () ->
+diff --git a/src/lib/server/eliommod_sessiongroups.ml b/src/lib/server/eliommod_sessiongroups.ml
+index e69a62a..b7eb8f7 100644
+--- a/src/lib/server/eliommod_sessiongroups.ml
++++ b/src/lib/server/eliommod_sessiongroups.ml
+@@ -475,7 +475,7 @@ module Pers = struct
+         (* First we close all sessions in the group *)
+ 
+         find sess_grp >>= fun cl ->
+-        Lwt_util.iter
++        Lwt_list.iter_p
+           (close_persistent_session2
+              ~cookie_level:(match cookie_level with
+                | `Client_process _ -> `Client_process | `Session -> `Session)