[gentoo-commits] repo/gentoo:master commit in: dev-ml/eliom/files/, dev-ml/eliom/
commit: 133e85b7d6febf3cf64a03dcca57c97974d255d7
Author: Alexis Ballier gentoo org>
AuthorDate: Wed Apr 12 18:51:46 2017 +
Commit: Alexis Ballier gentoo org>
CommitDate: Wed Apr 12 19:20:25 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=133e85b7
dev-ml/eliom: Fix build with lwt3.
Package-Manager: Portage-2.3.5, Repoman-2.3.2
dev-ml/eliom/eliom-6.2.0.ebuild | 5 +
dev-ml/eliom/eliom-.ebuild | 3 ++-
dev-ml/eliom/files/lwt3.patch | 44 +
3 files changed, 51 insertions(+), 1 deletion(-)
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-.ebuild b/dev-ml/eliom/eliom-.ebuild
index 74e7e33453c..42b48b1abdd 100644
--- a/dev-ml/eliom/eliom-.ebuild
+++ b/dev-ml/eliom/eliom-.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 000..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
+
+ :thread
+
:package(lwt,ocsigenserver,ocsigenserver.ext,tyxml.functor)
+-:package(react,js_of_ocaml)
++:package(lwt_react,react,js_of_ocaml)
+
+ :package(js_of_ocaml.deriving.ppx)
+
+@@ -24,7 +24,7 @@ true:keep_locs
+ : eliom_ppx
+
:package(ocsigenserver.cookies,ocsigenserver.polytables,ocsigenserver.baselib.base)
+ :package(deriving.runtime,js_of_ocaml.deriving)
+-:package(lwt.react,tyxml.functor,js_of_ocaml.tyxml)
++:package(lwt_react,tyxml.functor,js_of_ocaml.tyxml)
+ :package(react,js_of_ocaml,reactiveData)
+
+ :package(js_of_ocaml.deriving.ppx)
[gentoo-commits] repo/gentoo:master commit in: dev-ml/eliom/files/, dev-ml/eliom/
commit: 3259962977f7ec30f0803a904e748ce67f2638ab
Author: Alexis Ballier gentoo org>
AuthorDate: Mon Nov 28 21:17:07 2016 +
Commit: Alexis Ballier gentoo org>
CommitDate: Mon Nov 28 21:17:17 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32599629
dev-ml/eliom: fix build with reactivedata 0.2.1 and ocsigenserver 2.8; bug
#601102
Package-Manager: portage-2.3.2
dev-ml/eliom/eliom-5.0.0-r2.ebuild| 8 +-
dev-ml/eliom/eliom-.ebuild| 4 +-
dev-ml/eliom/files/ocsigen28.patch| 500 ++
dev-ml/eliom/files/reactivedata.patch | 44 +++
4 files changed, 551 insertions(+), 5 deletions(-)
diff --git a/dev-ml/eliom/eliom-5.0.0-r2.ebuild
b/dev-ml/eliom/eliom-5.0.0-r2.ebuild
index 6b4ae4b..0807fa3 100644
--- a/dev-ml/eliom/eliom-5.0.0-r2.ebuild
+++ b/dev-ml/eliom/eliom-5.0.0-r2.ebuild
@@ -17,10 +17,10 @@ IUSE="doc +ocamlopt +ppx"
RDEPEND=">=dev-lang/ocaml-4.03:=[ocamlopt?]
>=dev-ml/js_of_ocaml-2.8.2:=
- >=www-servers/ocsigenserver-2.5:=
+ >=www-servers/ocsigenserver-2.8:=
>=dev-ml/tyxml-4:=
>=dev-ml/deriving-0.6:=
- >=dev-ml/reactiveData-0.2:=
+ >=dev-ml/reactiveData-0.2.1:=
dev-ml/ocaml-ipaddr:=
dev-ml/react:=
dev-ml/ocaml-ssl:=
@@ -35,7 +35,9 @@ DEPEND="${RDEPEND}
src_prepare() {
epatch "${FILESDIR}/"{camlp4,oc43,oc43-2}.patch \
"${FILESDIR}/tyxml4.patch" \
- "${FILESDIR}/jsofocaml-282.patch"
+ "${FILESDIR}/jsofocaml-282.patch" \
+ "${FILESDIR}/reactivedata.patch" \
+ "${FILESDIR}/ocsigen28.patch"
}
src_compile() {
diff --git a/dev-ml/eliom/eliom-.ebuild b/dev-ml/eliom/eliom-.ebuild
index f408965..bc9355f 100644
--- a/dev-ml/eliom/eliom-.ebuild
+++ b/dev-ml/eliom/eliom-.ebuild
@@ -25,10 +25,10 @@ IUSE="doc +ocamlopt +ppx"
RDEPEND=">=dev-lang/ocaml-4.03:=[ocamlopt?]
>=dev-ml/js_of_ocaml-2.5-r1:=
- >=www-servers/ocsigenserver-2.5:=
+ >=www-servers/ocsigenserver-2.8:=
>=dev-ml/tyxml-4:=
>=dev-ml/deriving-0.6:=
- >=dev-ml/reactiveData-0.2:=
+ >=dev-ml/reactiveData-0.2.1:=
dev-ml/ocaml-ipaddr:=
dev-ml/react:=
dev-ml/ocaml-ssl:=
diff --git a/dev-ml/eliom/files/ocsigen28.patch
b/dev-ml/eliom/files/ocsigen28.patch
new file mode 100644
index ..fb3ef0a
--- /dev/null
+++ b/dev-ml/eliom/files/ocsigen28.patch
@@ -0,0 +1,500 @@
+Index: eliom-5.0.0/src/lib/eliom_common.server.ml
+===
+--- eliom-5.0.0.orig/src/lib/eliom_common.server.ml
eliom-5.0.0/src/lib/eliom_common.server.ml
+@@ -1372,7 +1372,7 @@ let create_persistent_table name =
+
+ let persistent_cookies_table :
+ (full_state_name * float option * timeout * perssessgrp option)
+-Ocsipersist.table Lazy.t =
++Ocsipersist.table Lwt.t Lazy.t =
+ lazy (create_persistent_table eliom_persistent_cookie_table)
+ (* Another tables, containing the session info for each cookie *)
+ (* the table contains:
+@@ -1390,7 +1390,7 @@ let persistent_cookies_table :
+ let remove_from_all_persistent_tables key =
+ Perstables.fold (* could be replaced by a parallel map *)
+ (fun thr t -> thr >>= fun () ->
+- Ocsipersist.remove (Ocsipersist.open_table t) key >>= Lwt_unix.yield)
++ Ocsipersist.open_table t >>= fun table -> Ocsipersist.remove table key
>>= Lwt_unix.yield)
+ (return ())
+ !perstables
+
+Index: eliom-5.0.0/src/lib/eliom_common.server.mli
+===
+--- eliom-5.0.0.orig/src/lib/eliom_common.server.mli
eliom-5.0.0/src/lib/eliom_common.server.mli
+@@ -609,10 +609,10 @@ module Perstables :
+ val fold : ('a -> 'b -> 'a) -> 'a -> 'b list -> 'a
+ end
+ val perstables : string list ref
+-val create_persistent_table : string -> 'a Ocsipersist.table
++val create_persistent_table : string -> 'a Ocsipersist.table Lwt.t
+ val persistent_cookies_table :
+ (full_state_name * float option * timeout * perssessgrp option)
+- Ocsipersist.table Lazy.t
++ Ocsipersist.table Lwt.t Lazy.t
+ val remove_from_all_persistent_tables : string -> unit Lwt.t
+ val absolute_change_sitedata : sitedata -> unit
+ val get_current_sitedata : unit -> sitedata
+Index: eliom-5.0.0/src/lib/eliom_reference.server.ml
+===
+--- eliom-5.0.0.orig/src/lib/eliom_reference.server.ml
eliom-5.0.0/src/lib/eliom_reference.server.ml
+@@ -32,8 +32,8 @@ type 'a eref_kind =
+ | Ref of 'a lazy_t ref (* Ocaml reference *)
+ | Vol of 'a volatile_table Lazy.t (* Vol. table (group, session, process) *)
+ | Ocsiper of 'a option Ocsipersist.t Lwt.t (* Global persist. table *)
+- | Ocsiper_sit of 'a Ocsipersist.table (* Persist. table for site *)
+- | Per of 'a persistent_table (* Persist. table for group session or process
*)
++
[gentoo-commits] repo/gentoo:master commit in: dev-ml/eliom/files/, dev-ml/eliom/
commit: 56013d6071db66e97a6a7193594792b595610f3a
Author: Alexis Ballier gentoo org>
AuthorDate: Wed Sep 7 09:33:53 2016 +
Commit: Alexis Ballier gentoo org>
CommitDate: Wed Sep 7 09:34:01 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56013d60
dev-ml/eliom: backport another patch from upstream to work with ocaml 4.03
Package-Manager: portage-2.3.0
...eliom-5.0.0-r1.ebuild => eliom-5.0.0-r2.ebuild} | 2 +-
dev-ml/eliom/files/oc43-2.patch| 136 +
2 files changed, 137 insertions(+), 1 deletion(-)
diff --git a/dev-ml/eliom/eliom-5.0.0-r1.ebuild
b/dev-ml/eliom/eliom-5.0.0-r2.ebuild
similarity index 96%
rename from dev-ml/eliom/eliom-5.0.0-r1.ebuild
rename to dev-ml/eliom/eliom-5.0.0-r2.ebuild
index 8aaec1f..36923d1 100644
--- a/dev-ml/eliom/eliom-5.0.0-r1.ebuild
+++ b/dev-ml/eliom/eliom-5.0.0-r2.ebuild
@@ -34,7 +34,7 @@ DEPEND="${RDEPEND}
src_prepare() {
if has_version '>=dev-lang/ocaml-4.03' ; then
- epatch "${FILESDIR}/"{camlp4,oc43}.patch
+ epatch "${FILESDIR}/"{camlp4,oc43,oc43-2}.patch
fi
has_version '>=dev-ml/tyxml-4' && epatch "${FILESDIR}/tyxml4.patch"
}
diff --git a/dev-ml/eliom/files/oc43-2.patch b/dev-ml/eliom/files/oc43-2.patch
new file mode 100644
index ..c7eb8e2
--- /dev/null
+++ b/dev-ml/eliom/files/oc43-2.patch
@@ -0,0 +1,136 @@
+commit 27c69ac5dfbc26744e304232bb8c0cf22d396082
+Author: Vasilis Papavasileiou
+Date: Thu May 5 11:14:02 2016 -0400
+
+Fix PPX for 4.03 (empty let bindings)
+
+diff --git a/src/ppx/ppx_eliom_client.ml b/src/ppx/ppx_eliom_client.ml
+index 580d2b5..fb2d263 100644
+--- a/src/ppx/ppx_eliom_client.ml
b/src/ppx/ppx_eliom_client.ml
+@@ -89,21 +89,25 @@ module Pass = struct
+ ]
+
+ let define_client_functions ~loc client_value_datas =
+-let bindings =
+- List.map
+-(fun (_num, id, expr, args) ->
+- let patt = Pat.var id in
+- let typ = find_fragment id in
+- let args = List.map Pat.var args in
+- let expr =
+- [%expr
+- fun [%p pat_args args] -> ([%e expr] : [%t typ])
+- ] [@metaloc loc]
+- in
+- Vb.mk ~loc patt expr)
+-client_value_datas
+-in
+-Str.value ~loc Nonrecursive bindings
++match client_value_datas with
++| [] ->
++ []
++| _ ->
++ let bindings =
++List.map
++ (fun (_num, id, expr, args) ->
++ let patt = Pat.var id in
++ let typ = find_fragment id in
++ let args = List.map Pat.var args in
++ let expr =
++ [%expr
++ fun [%p pat_args args] -> ([%e expr] : [%t typ])
++ ] [@metaloc loc]
++ in
++ Vb.mk ~loc patt expr)
++ client_value_datas
++ in
++ [Str.value ~loc Nonrecursive bindings]
+
+ (* For injections *)
+
+@@ -139,8 +143,8 @@ module Pass = struct
+ let client_expr_data = flush_client_value_datas () in
+ open_client_section loc ::
+ register_client_closures client_expr_data @
+-[ define_client_functions loc client_expr_data ;
+- item ;
++define_client_functions loc client_expr_data @
++[ item ;
+ close_server_section loc ;
+ ]
+
+@@ -155,11 +159,13 @@ module Pass = struct
+ push_client_value_data num id expr
+ (List.map fst escaped_bindings);
+
+-match context with
+-| `Server ->
++match context, escaped_bindings with
++| `Server, _ ->
+ (* We are in a server fragment, this code should always be discarded. *)
+ Exp.extension @@ AM.extension_of_error @@ Location.errorf "Eliom: ICE"
+-| `Shared ->
++| `Shared, [] ->
++ [%expr [%e frag_eid] ()][@metaloc loc]
++| `Shared, _ ->
+ let bindings =
+ List.map
+ (fun (gen_id, expr) ->
+diff --git a/src/ppx/ppx_eliom_server.ml b/src/ppx/ppx_eliom_server.ml
+index 97f0b53..b5238ad 100644
+--- a/src/ppx/ppx_eliom_server.ml
b/src/ppx/ppx_eliom_server.ml
+@@ -85,6 +85,7 @@ module Pass = struct
+ let $gen_id$ = $orig_expr$ and ...
+ (Necessary for injections in shared section) *)
+ let bind_injected_idents injections =
++assert (injections <> []);
+ let bindings =
+ List.map
+ (fun (txt, expr,_) ->
+@@ -134,10 +135,15 @@ module Pass = struct
+
+ let client_str item =
+ let all_injections = flush_injections () in
+-let loc = item.pstr_loc in
+-[ bind_injected_idents all_injections;
++let ccs =
++ let loc = item.pstr_loc in
+ close_client_section loc all_injections
+-]
++in
++match all_injections with
++| [] ->
++ [ ccs ]
++| l ->
++ [ bind_injected_idents l ; ccs ]
+
+ let server_str item = [
+ item ;
+@@ -146,12 +152,19 @@ module Pass = struct
+
+ let shared_str item =
+ let all_injections =
[gentoo-commits] repo/gentoo:master commit in: dev-ml/eliom/files/, dev-ml/eliom/
commit: 5f0dbdf6b728cfc22bcc62db3cca161f8cc2796d
Author: Alexis Ballier gentoo org>
AuthorDate: Tue Jan 19 12:06:52 2016 +
Commit: Alexis Ballier gentoo org>
CommitDate: Tue Jan 19 12:06:52 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f0dbdf6
dev-ml/eliom: remove old
Package-Manager: portage-2.2.27
Signed-off-by: Alexis Ballier gentoo.org>
dev-ml/eliom/Manifest | 2 --
dev-ml/eliom/eliom-3.0.3.ebuild| 61 -
dev-ml/eliom/eliom-4.1.0-r1.ebuild | 60
dev-ml/eliom/eliom-4.1.0.ebuild| 54 -
dev-ml/eliom/files/lwt.patch | 70 --
5 files changed, 247 deletions(-)
diff --git a/dev-ml/eliom/Manifest b/dev-ml/eliom/Manifest
index cbfca28..5909867 100644
--- a/dev-ml/eliom/Manifest
+++ b/dev-ml/eliom/Manifest
@@ -1,3 +1 @@
-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
DIST eliom-4.2.tar.gz 699337 SHA256
30d180b72d21177d09b311785e08e54cc221b148d969f17334f8be6eecfb783d SHA512
c7c75dc00defe0c269aba4e4fbdc00a824b781b124e3f51747e29533c4aeedaecb68c7ebcb38b4cc9a51c3796abdfa680ba0702a83415911406b25cd07ad66c7
WHIRLPOOL
2a36deeb10cbf3b29c76b33185de1c848615293830f7a3701c2d87025be0ed575cdadf238c696ad4716e50f2b0258febef7b7039a1980aafeaf6e1c483ec46ca
diff --git a/dev-ml/eliom/eliom-3.0.3.ebuild b/dev-ml/eliom/eliom-3.0.3.ebuild
deleted file mode 100644
index 24545c2..000
--- a/dev-ml/eliom/eliom-3.0.3.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils multilib findlib
-
-DESCRIPTION="A web framework to program client/server applications"
-HOMEPAGE="http://ocsigen.org/eliom/;
-SRC_URI="http://www.ocsigen.org/download/${P}.tar.gz;
-
-LICENSE="LGPL-2.1-with-linking-exception"
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-IUSE="doc +ocamlopt"
-
-DEPEND=">=dev-lang/ocaml-3.12:=[ocamlopt?]
- >=dev-ml/js_of_ocaml-1.3.2:=
- >=www-servers/ocsigenserver-2.2.0:=
- >=dev-ml/tyxml-2.1:=
- >=dev-ml/deriving-ocsigen-0.3:=
- dev-ml/react:=
- dev-ml/ocaml-ssl:=
- dev-ml/calendar:="
-RDEPEND="${DEPEND}"
-
-src_configure() {
- sh configure \
- --prefix "/usr" \
- --docdir "/usr/share/doc/${PF}/html" \
- --mandir "/usr/share/man/" \
- --temproot "${ED}" \
- --libdir "/usr/$(get_libdir)/ocaml" \
- || die "configure failed"
-}
-
-src_compile() {
- if use ocamlopt ; then
- emake
- else
- emake byte
- fi
- use doc && emake doc -j1
-}
-
-src_test() {
- emake tests.byte
- use ocamlopt && emake tests.opt
-}
-
-src_install() {
- findlib_src_preinst
- if use ocamlopt; then
- emake install
- else
- emake install.byte
- fi
- use doc && emake install.doc
- dodoc CHANGES README
-}
diff --git a/dev-ml/eliom/eliom-4.1.0-r1.ebuild
b/dev-ml/eliom/eliom-4.1.0-r1.ebuild
deleted file mode 100644
index 527e829..000
--- a/dev-ml/eliom/eliom-4.1.0-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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
