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

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A

4 files changed, 146 insertions, 19 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/Manifest b/dev-ml/eliom/Manifest
index 1d0a7f2ad86c..31ce08ff29db 100644
--- a/dev-ml/eliom/Manifest
+++ b/dev-ml/eliom/Manifest
@@ -1,28 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
+AUX lwt.patch 2796 SHA256 25b2ac10b826347271b30f11468f5fdf1867cd5973d134693f0db73e9715bd20 SHA512 e66d185be46a4f3da4d6f00d4f87ce78acc0a0748a0636bce39df989db6b31307759cb44d92942f0070fbbfa403910de14c11028c486ef1428d46b49ba128a22 WHIRLPOOL 6433e9308b9d33a83b356f2a9caa765138441d5fd451f8399a77a0a76053233df8c6df9716466556aa58f0b09022470511ed05a25c083a78dadff2f3788ed428
 DIST eliom-3.0.3.tar.gz 743842 SHA256 b598bfbfc37fb9164024df71352e74d26d6ce2095f89f3d52072b3f7334a5b86 SHA512 4112d9422a1407b3d82a716aedf86a3efad733eb5a98fd3d4356e2bd149cdb6ef029efd0dae0e9ed7f89613cf6cbd1c5c25f2ef8f905bf2ad7709db1f7d39075 WHIRLPOOL af9aebe320ab6a8dce96ede3c6aaf57c90a537ffb520766ad08f23bde6cbe303ff39707dae3c91a4f980e163b47b071958d488f3232f3a1359ab53eaec09001c
 DIST eliom-4.1.0.tar.gz 699262 SHA256 44541cdcc93b622fee79a1d9bdd46d6caf7ace71b1a3891e6d7de93f70ae6783 SHA512 6dac3f2d26a3730df48270c62e16abec935656022a2cbb1c221ce040ff574b79e82d7da977d58fbd67ca884b64611e6a97a4144a5a142f8aa6c887897cf230f5 WHIRLPOOL a95985afae803a11744dbc1468d4d07d07938f63c5a570e67545b96887ff0d2ca2a1971a9be35c45dbe28b1c3f74bf473a136843143d45cb9bd2451ca85abd64
 EBUILD eliom-3.0.3.ebuild 1304 SHA256 bba540d0474da705092090867b09a138d1d1657d0bede361d1237b41917f9378 SHA512 232a71e78604b358680b394d565289a749bc98cc0d75a511418454994d23c3f7fefe63006b4a984e2d30045a2e789e7238d7fbfadbce3ba296f128ef47b0157f WHIRLPOOL b157e3f19777717dc23c066b7942f003ad27611464288b322f954d56a2e318d8d36343518ca5f846f54fd46fc47d4a82be9c64d5af6fab29a2fce202f3012959
+EBUILD eliom-4.1.0-r1.ebuild 1382 SHA256 98255386c6040e4e042a029717332b14e055eb9c32205717f10aebe2f52c6061 SHA512 21587d69f607d3e9dd25a7b5d9a1a838efd5b068cfc77451d51edd7315ddcf3130006147dd5dba0f0b08cf5f847728330b947ced564a3370d3591a85728507b6 WHIRLPOOL 88645fc6d589132cf0732bdc4b8b3377ce462cfacc64ef5d21b56475df5e497edd4a7ed07a577404598bca677de7b48b8d6903f48e82771a35147c68117f3d95
 EBUILD eliom-4.1.0.ebuild 1271 SHA256 64ad9c56bac329f7d368ff7ca7afdf0f3e2ba9b061f963c43dfc9302ebdf58f4 SHA512 3b4e74007d5a8500f38d454003f4526f4f73ae456bc12e7010496a87241a7ce34aaceb3a7e580c3450dc6f6bd4de2ff82c92df7f61bb4f414d4aa91d466317c0 WHIRLPOOL 6fd898953ca9c95e7ef754db796e908193c7369adf0499eb4680ad9deb0116f6ea3d272d009b74e96f957d94957fea665f78522accc1a6b009850bbb6b151042
-MISC ChangeLog 1081 SHA256 3095b87d9cf0b0a5911b08e5cd5617638b2e7baf0537c74d5151dfde0cab84e3 SHA512 368b02a9b062bb0d3bed1b7ecb719c768b4507f828fb8c33352619c4214ede1f4e34dff598778295fe1f4893daa570916604af93eb2dc7030b42e0677b94fe1c WHIRLPOOL 0e57b21885de3eeddd8b516bb62d107d6d76bf6d3bad495505d07acfde4a2f9ec9419fa947893e9d9b3aa5526fb48beaa09aaadcfcfbf3838eb264c22385142a
+MISC ChangeLog 1303 SHA256 c3f1a389a1af3edc2e4b5da1b2e4822b25b0ab10abb160b8587d90909056ef0a SHA512 994a47074ff98445d9079d89438460e8d1f602dbb87e7589bb6742f8ffa28b2d0b041508118bfc0fbf82199990aba107562d86d3798f749fb8f9d45aba0ee167 WHIRLPOOL 0ccf29398e6bd42cf0b1321841afbe45373ff3cf5047e54b5fb283c6e237367ed78eec42f6bf321f0024ad7576e1aecee36fd7e56e28090c606bb98e3f0379d7
 MISC metadata.xml 239 SHA256 5002dd0b74855815b2741ce3436472fffcf9de21546f5d879bee485d524c0bd0 SHA512 70206b246962f9d0fc75ab53cfdde1aa13433bccf2e33832fbbec70f910741ebdd8160f9c617d4800592b97125f43eba9d7d73e9341cf413613436a413ae6246 WHIRLPOOL cd494c1006949d87579da07a6376ce648594eaadd0ca23974e4f4e14243bcd715c95263406f401e9b979f459a0a1a0649ec276ab924e64373e42d7887e69d915
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCgBmBQJVdAq0XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiEJwQAKGcQHuZeHtaRrYu+ZxGkc55
-Yf8z/wlPEeTxvEZw8a6pzdWQd95HypUe7WV02Uh3zNyiwp7jsoSJhjLMepM3BC5G
-LOYcmG6K9K2D+sPeJiFZTgbyvS1/zNrPz5rMEWvEc0H06U7p8wMz+ACNWtEY5yf7
-JC65FAOK37XGw95XKsb0aNhTuoM1RM58zNWHyXvDbz5ey9gNhhAtAE4cPVhrOQpP
-cNTgHk1RHdjZVaj3KYJHiEnvxLewUjqps3cHGxaiUxDvbSEn1dWz90M8WOGWelHC
-OHV8IvFCSnjD2UyLIVtamrCOc3CbVv3X4GA8lpnYamWWHWsN1pNaSFTYVS0FUg6Y
-J9fon+BeFthPlzipIV/9upUM1RBkaW9ksVH5OeFf+fbNHdOuqo6G99ExeJ5FG4zt
-vyhoVJ7r2xkgE9gu1dxhQeQGL2xxy7N/AHUaARInm8ADL5EhAFQYKhscis7xzBry
-IzL0c4ulSUDF3n0capkekvD2AFJ3SdK2duziuV/2zYY1Ca9UHbsC3CXerSCtBUQf
-KHLs9dzy2HHD4+UPI2v/0mN4041nL2KY2BTJXq7HlurRXLXE74eYF8C5U77qn16j
-HDFmUKxI0xLKP4233KWB6RRsalZGaC4Zttwzj+f6Cr9XaouvYigPoQqCJ4HLFlqZ
-zv1AsvVWMeZ0oVNYAhMU
-=9Obn
+iEYEAREIAAYFAlWnsBAACgkQvFcC4BYPU0raMwCffeANDtlIJlCQB6IlFFOuOyj9
+DEsAnR8DlqUv4TaDfg7A4HHfdfLPjlL3
+=VNZ0
 -----END PGP SIGNATURE-----
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)