[gentoo-commits] repo/gentoo:master commit in: dev-ml/eliom/, dev-ml/eliom/files/
commit: 90c300d4d72b06a672e29bb44cd7985e01bac68d
Author: Alexis Ballier gentoo org>
AuthorDate: Mon Dec 19 12:54:27 2016 +
Commit: Alexis Ballier gentoo org>
CommitDate: Mon Dec 19 12:54:27 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90c300d4
dev-ml/eliom: remove old
Package-Manager: Portage-2.3.3, Repoman-2.3.1
dev-ml/eliom/Manifest |1 -
dev-ml/eliom/eliom-5.0.0-r2.ebuild | 67 --
dev-ml/eliom/files/camlp4.patch| 48 -
dev-ml/eliom/files/jsofocaml-282.patch | 361 ---
dev-ml/eliom/files/oc43-2.patch| 136 ---
dev-ml/eliom/files/oc43.patch | 37 -
dev-ml/eliom/files/ocsigen28.patch | 500 --
dev-ml/eliom/files/reactivedata.patch | 44 -
dev-ml/eliom/files/tyxml4.patch| 1642
9 files changed, 2836 deletions(-)
diff --git a/dev-ml/eliom/Manifest b/dev-ml/eliom/Manifest
index 08bcca8..3b5090e 100644
--- a/dev-ml/eliom/Manifest
+++ b/dev-ml/eliom/Manifest
@@ -1,2 +1 @@
-DIST eliom-5.0.0.tar.gz 728278 SHA256
6726500f9a54478def95875d04098dc8dc829d4a10e06896ff4f037bb1c03cbd SHA512
1c5297e376c3a46935de369b418638a772304246b73756f8bc052301b48d62a37af527274bf1a05064f33b60ff9dcde057a0030f083136fa4e1c0cfa07f01887
WHIRLPOOL
ca1186787a8f938cf029f9a5c9904ed0324a3d24d2f0d0834dd1e2b2f995de6d57d1040b4d128de8233255ca385478f0ba3bf597c2f0315ab2f1894118755dca
DIST eliom-6.0.0.tar.gz 722673 SHA256
ec5636481be98256b13a5e551f6a8c32662e1c3211887a22eedf5c8958f9 SHA512
c59261bb6ba2303a7951de2e689abcb55af92b53a145d42054244d253b6757d72ba3f937772219b2b0aa5bccfe1a74baf62c938f40c1cce90720b6efe7be3b63
WHIRLPOOL
e4f8c44c16dbc33c7576a117a25cb2f709a893ad82baa517fb2d5a776b0838affbef56aba84a977903c71d32987f3d16af485c5cf81cc39395025d996226
diff --git a/dev-ml/eliom/eliom-5.0.0-r2.ebuild
b/dev-ml/eliom/eliom-5.0.0-r2.ebuild
deleted file mode 100644
index 0807fa3..
--- a/dev-ml/eliom/eliom-5.0.0-r2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2016 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 +ppx"
-
-RDEPEND=">=dev-lang/ocaml-4.03:=[ocamlopt?]
- >=dev-ml/js_of_ocaml-2.8.2:=
- >=www-servers/ocsigenserver-2.8:=
- >=dev-ml/tyxml-4:=
- >=dev-ml/deriving-0.6:=
- >=dev-ml/reactiveData-0.2.1:=
- dev-ml/ocaml-ipaddr:=
- dev-ml/react:=
- dev-ml/ocaml-ssl:=
- >=dev-ml/lwt-2.5.0:=
- dev-ml/calendar:=
- dev-ml/camlp4:=
- ppx? ( >=dev-ml/ppx_tools-0.99.3:= )"
-DEPEND="${RDEPEND}
- dev-ml/ocamlbuild
- dev-ml/opam"
-
-src_prepare() {
- epatch "${FILESDIR}/"{camlp4,oc43,oc43-2}.patch \
- "${FILESDIR}/tyxml4.patch" \
- "${FILESDIR}/jsofocaml-282.patch" \
- "${FILESDIR}/reactivedata.patch" \
- "${FILESDIR}/ocsigen28.patch"
-}
-
-src_compile() {
- if use ocamlopt ; then
- emake PPX=$(usex ppx true false) all
- else
- emake PPX=$(usex ppx true false) 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.md
- 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/camlp4.patch b/dev-ml/eliom/files/camlp4.patch
deleted file mode 100644
index 59e94ab..
--- a/dev-ml/eliom/files/camlp4.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-commit f157a5b913451b85e8cfe7549c66e5c98669233b
-Author: Vasilis Papavasileiou
-Date: Wed Mar 2 14:23:02 2016 +0100
-
-Compile against Camlp4 4.02+7
-
-diff --git a/src/syntax/pa_eliom_seed.ml b/src/syntax/pa_eliom_seed.ml
-index c101ff8..dc31caa 100644
a/src/syntax/pa_eliom_seed.ml
-+++ b/src/syntax/pa_eliom_seed.ml
-@@ -632,8 +632,26 @@ module Register(Id : sig val name: string end)(Pass :
Pass) = struct
- | None ->
- Printf.ksprintf (Syntax_error.raise loc) fmt
-
--module E2 = Camlp4.ErrorHandler.Register(Syntax_error)
--DELETE_RULE Gram expr: "{"; TRY [label_expr_list; "}"] END;
-+module E2 = Camlp4.ErrorHandler.Register(Syntax_error) ;;
-+
-+try
-+ DELETE_RULE Gram expr: "{"; TRY
[gentoo-commits] repo/gentoo:master commit in: dev-ml/eliom/, dev-ml/eliom/files/
commit: f2518d6d2f139f677c63c9edc39511dc83c9c852
Author: Alexis Ballier gentoo org>
AuthorDate: Mon Oct 10 14:03:22 2016 +
Commit: Alexis Ballier gentoo org>
CommitDate: Mon Oct 10 14:03:34 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2518d6d
dev-ml/eliom: fix build with js of ocaml 2.8.2, bug #593978.
Also, make all patches mandatory and bump required versions in deps.
Package-Manager: portage-2.3.1
dev-ml/eliom/eliom-5.0.0-r2.ebuild | 13 +-
dev-ml/eliom/files/jsofocaml-282.patch | 361 +
2 files changed, 367 insertions(+), 7 deletions(-)
diff --git a/dev-ml/eliom/eliom-5.0.0-r2.ebuild
b/dev-ml/eliom/eliom-5.0.0-r2.ebuild
index 36923d1..6b4ae4b 100644
--- a/dev-ml/eliom/eliom-5.0.0-r2.ebuild
+++ b/dev-ml/eliom/eliom-5.0.0-r2.ebuild
@@ -15,10 +15,10 @@ SLOT="0/${PV}"
KEYWORDS="~amd64"
IUSE="doc +ocamlopt +ppx"
-RDEPEND=">=dev-lang/ocaml-4.00:=[ocamlopt?]
- >=dev-ml/js_of_ocaml-2.5-r1:=
+RDEPEND=">=dev-lang/ocaml-4.03:=[ocamlopt?]
+ >=dev-ml/js_of_ocaml-2.8.2:=
>=www-servers/ocsigenserver-2.5:=
- >=dev-ml/tyxml-3.6:=
+ >=dev-ml/tyxml-4:=
>=dev-ml/deriving-0.6:=
>=dev-ml/reactiveData-0.2:=
dev-ml/ocaml-ipaddr:=
@@ -33,10 +33,9 @@ DEPEND="${RDEPEND}
dev-ml/opam"
src_prepare() {
- if has_version '>=dev-lang/ocaml-4.03' ; then
- epatch "${FILESDIR}/"{camlp4,oc43,oc43-2}.patch
- fi
- has_version '>=dev-ml/tyxml-4' && epatch "${FILESDIR}/tyxml4.patch"
+ epatch "${FILESDIR}/"{camlp4,oc43,oc43-2}.patch \
+ "${FILESDIR}/tyxml4.patch" \
+ "${FILESDIR}/jsofocaml-282.patch"
}
src_compile() {
diff --git a/dev-ml/eliom/files/jsofocaml-282.patch
b/dev-ml/eliom/files/jsofocaml-282.patch
new file mode 100644
index ..985432f
--- /dev/null
+++ b/dev-ml/eliom/files/jsofocaml-282.patch
@@ -0,0 +1,361 @@
+Backported from:
+
+commit 4edaf2275e2f7a027f3c7dc52e1e295a6e56b19a
+Author: Vasilis Papavasileiou
+Date: Thu Aug 18 19:40:56 2016 +0200
+
+Fix ocsigen/js_of_ocaml#518
+
+upstream.
+
+Index: eliom-5.0.0/src/lib/eliom_client.client.ml
+===
+--- eliom-5.0.0.orig/src/lib/eliom_client.client.ml
eliom-5.0.0/src/lib/eliom_client.client.ml
+@@ -461,23 +461,29 @@ let raw_event_handler value =
+
+ let closure_name_prefix = Eliom_lib_base.RawXML.closure_name_prefix
+ let closure_name_prefix_len = String.length closure_name_prefix
+-let reify_caml_event name node ce : string * (#Dom_html.event Js.t -> bool) =
++let reify_caml_event name node ce =
+ match ce with
+- | Xml.CE_call_service None -> name,(fun _ -> true)
++ | Xml.CE_call_service None -> name, `Other (fun _ -> true)
+ | Xml.CE_call_service (Some (`A, cookies_info, tmpl)) ->
+-name, (fun ev ->
++name, `Other (fun ev ->
+ let node = Js.Opt.get (Dom_html.CoerceTo.a node)
+ (fun () -> Lwt_log.raise_error ~section "not an anchor element")
+ in
+ raw_a_handler node cookies_info tmpl ev)
+ | Xml.CE_call_service
+ (Some ((`Form_get | `Form_post) as kind, cookies_info, tmpl)) ->
+-name, (fun ev ->
++name, `Other (fun ev ->
+ let form = Js.Opt.get (Dom_html.CoerceTo.form node)
+ (fun () -> Lwt_log.raise_error ~section "not a form element") in
+ raw_form_handler form kind cookies_info tmpl ev)
+ | Xml.CE_client_closure f ->
+- name, (fun ev -> try f ev; true with False -> false)
++ name, `Other (fun ev -> try f ev; true with False -> false)
++ | Xml.CE_client_closure_keyboard f ->
++ name,
++ `Keyboard (fun ev -> try f ev; true with Eliom_lib.False -> false)
++ | Xml.CE_client_closure_mouse f ->
++ name,
++ `Mouse (fun ev -> try f ev; true with Eliom_lib.False -> false)
+ | Xml.CE_registered_closure (_, cv) ->
+ let name =
+ let len = String.length name in
+@@ -485,16 +491,27 @@ let reify_caml_event name node ce : stri
+ then String.sub name closure_name_prefix_len
+ (len - closure_name_prefix_len)
+ else name in
+-name, raw_event_handler cv
++name, `Other (raw_event_handler cv)
+
+ let register_event_handler, flush_load_script =
+ let add, _, flush = create_buffer () in
+ let register node (name, ev) =
+-let name,f = reify_caml_event name node ev in
+-if name = "onload"
+-then add f
+-else Js.Unsafe.set node (Js.bytestring name)
+-(Dom_html.handler (fun ev -> Js.bool (f ev)))
++ match reify_caml_event name node ev with
++ | "onload", `Other f ->
++ add f
++ | "onload", `Keyboard _ ->
++ failwith "keyboard event handler for onload"
++ | "onload", `Mouse _ ->
++ failwith "keyboard event handler for onload"
++ | name, `Other f ->
++ Js.Unsafe.set node (Js.bytestring name)
++ (Dom_html.handler (fun ev -> Js.bool (f
[gentoo-commits] repo/gentoo:master commit in: dev-ml/eliom/, dev-ml/eliom/files/
commit: 32979e040b3dc7141de2323645bc2d7955a5ce26
Author: Alexis Ballier gentoo org>
AuthorDate: Fri Aug 12 12:46:21 2016 +
Commit: Alexis Ballier gentoo org>
CommitDate: Fri Aug 12 12:47:52 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32979e04
dev-ml/eliom: fix build with tyxml4
Package-Manager: portage-2.3.0
dev-ml/eliom/eliom-5.0.0-r1.ebuild |1 +
dev-ml/eliom/files/tyxml4.patch| 1642
2 files changed, 1643 insertions(+)
diff --git a/dev-ml/eliom/eliom-5.0.0-r1.ebuild
b/dev-ml/eliom/eliom-5.0.0-r1.ebuild
index b5103a3..8aaec1f 100644
--- a/dev-ml/eliom/eliom-5.0.0-r1.ebuild
+++ b/dev-ml/eliom/eliom-5.0.0-r1.ebuild
@@ -36,6 +36,7 @@ src_prepare() {
if has_version '>=dev-lang/ocaml-4.03' ; then
epatch "${FILESDIR}/"{camlp4,oc43}.patch
fi
+ has_version '>=dev-ml/tyxml-4' && epatch "${FILESDIR}/tyxml4.patch"
}
src_compile() {
diff --git a/dev-ml/eliom/files/tyxml4.patch b/dev-ml/eliom/files/tyxml4.patch
new file mode 100644
index 000..bf749e4
--- /dev/null
+++ b/dev-ml/eliom/files/tyxml4.patch
@@ -0,0 +1,1642 @@
+Index: eliom-5.0.0/src/lib/eliom_content.client.mli
+===
+--- eliom-5.0.0.orig/src/lib/eliom_content.client.mli
eliom-5.0.0/src/lib/eliom_content.client.mli
+@@ -292,7 +292,7 @@ module Html5 : sig
+ See {% <> %} *)
+
+ (** Cf. {% <> %}. *)
+-module Raw : Html5_sigs.Make(Xml)(Svg.F.Raw).T
++module Raw : Html_sigs.Make(Xml)(Svg.F.Raw).T
+ with type +'a elt = 'a elt
+and type +'a attrib = 'a attrib
+
+@@ -313,7 +313,7 @@ module Html5 : sig
+ See {% <> %} *)
+
+ (** Cf. {% <> %}. *)
+-module Raw : Html5_sigs.Make(Xml)(Svg.D.Raw).T
++module Raw : Html_sigs.Make(Xml)(Svg.D.Raw).T
+ with type +'a elt = 'a elt
+and type +'a attrib = 'a attrib
+
+@@ -352,7 +352,7 @@ module Html5 : sig
+ val filter_attrib : 'a attrib -> bool React.signal -> 'a attrib
+
+ (** Cf. {% <> %}. *)
+-module Raw : Html5_sigs.Make(Eliom_content_core.Xml_wed)(Svg.R.Raw).T
++module Raw : Html_sigs.Make(Eliom_content_core.Xml_wed)(Svg.R.Raw).T
+ with type +'a elt = 'a elt
+and type +'a attrib = 'a attrib
+
+Index: eliom-5.0.0/src/lib/eliom_content.server.mli
+===
+--- eliom-5.0.0.orig/src/lib/eliom_content.server.mli
eliom-5.0.0/src/lib/eliom_content.server.mli
+@@ -309,7 +309,7 @@ module Html5 : sig
+ {{:http://ocsigen.org/howto/forms/}"how to make forms"} *)
+
+ (** See {% <> %}. *)
+-module Raw : Html5_sigs.Make(Xml)(Svg.F.Raw).T
++module Raw : Html_sigs.Make(Xml)(Svg.F.Raw).T
+ with type +'a elt = 'a elt
+and type +'a attrib = 'a attrib
+
+@@ -337,7 +337,7 @@ module Html5 : sig
+ {{:http://ocsigen.org/howto/forms/}"how to make forms"} *)
+
+ (** See {% <> %}. *)
+-module Raw : Html5_sigs.Make(Xml)(Svg.D.Raw).T
++module Raw : Html_sigs.Make(Xml)(Svg.D.Raw).T
+ with type +'a elt = 'a elt
+and type +'a attrib = 'a attrib
+
+@@ -406,7 +406,7 @@ module Html5 : sig
+ {% <> %}. *)
+ module R : sig
+
+-include Html5_sigs.Make(Xml_shared)(Svg.R.Raw).T
++include Html_sigs.Make(Xml_shared)(Svg.R.Raw).T
+ with type 'a elt = 'a elt
+and type 'a attrib = 'a attrib
+
+@@ -414,7 +414,7 @@ module Html5 : sig
+ [\[> Html5_types.span\] elt]
+ out of the string signal [s]. *)
+ val pcdata :
+- string Eliom_shared.React.S.t -> [> Html5_types.span] elt
++ string Eliom_shared.React.S.t -> [> Html_types.span] elt
+
+ (** [node s] produces an ['a elt] out of the shared reactive
+ signal [s]. *)
+Index: eliom-5.0.0/src/lib/eliom_content_core.client.ml
+===
+--- eliom-5.0.0.orig/src/lib/eliom_content_core.client.ml
eliom-5.0.0/src/lib/eliom_content_core.client.ml
+@@ -175,7 +175,7 @@ end
+
+ module Xml_wed =
+ struct
+- module W = Tyxml_js.Xml_wrap
++ module W = Tyxml_js.Wrap
+ type 'a wrap = 'a W.t
+ type 'a list_wrap = 'a W.tlist
+ type uri = Xml.uri
+@@ -188,7 +188,7 @@ struct
+ type attrib = Xml.attrib
+
+ let float_attrib name s : attrib =
+-name, Xml.RAReact (Tyxml_js.Xml_wrap.fmap (fun f -> Some (Xml.AFloat f))
s)
++name, Xml.RAReact (Tyxml_js.Wrap.fmap (fun f -> Some (Xml.AFloat f)) s)
+ let int_attrib name s =
+ name, Xml.RAReact (React.S.map (fun f -> Some (Xml.AInt f)) s)
+ let string_attrib name s =
+@@ -320,7 +320,7 @@ module Html5 = struct
+ let lazy_node ?(a = []) name children =
+ make (Node (name, a, Eliom_lazy.force children))
+ end
+-module Raw = Html5_f.Make(Xml')(Svg.D.Raw)
++module Raw = Html_f.Make(Xml')(Svg.D.Raw)
+
+ include Raw
+
+@@ -340,7 +340,7 @@ module Html5 = struct
+
+
[gentoo-commits] repo/gentoo:master commit in: dev-ml/eliom/, dev-ml/eliom/files/
commit: 6a42f01bcca5713a9f6a7c1ed81441c8213af56b
Author: Alexis Ballier gentoo org>
AuthorDate: Fri Aug 12 11:02:07 2016 +
Commit: Alexis Ballier gentoo org>
CommitDate: Fri Aug 12 11:03:53 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a42f01b
dev-ml/eliom: fix build with ocaml 4.03 and add missing dep on camlp4
Package-Manager: portage-2.3.0
.../{eliom-5.0.0.ebuild => eliom-5.0.0-r1.ebuild} | 9 +++-
dev-ml/eliom/files/camlp4.patch| 48 ++
dev-ml/eliom/files/oc43.patch | 37 +
3 files changed, 93 insertions(+), 1 deletion(-)
diff --git a/dev-ml/eliom/eliom-5.0.0.ebuild
b/dev-ml/eliom/eliom-5.0.0-r1.ebuild
similarity index 88%
rename from dev-ml/eliom/eliom-5.0.0.ebuild
rename to dev-ml/eliom/eliom-5.0.0-r1.ebuild
index e0d8cb7..b5103a3 100644
--- a/dev-ml/eliom/eliom-5.0.0.ebuild
+++ b/dev-ml/eliom/eliom-5.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -26,11 +26,18 @@ RDEPEND=">=dev-lang/ocaml-4.00:=[ocamlopt?]
dev-ml/ocaml-ssl:=
>=dev-ml/lwt-2.5.0:=
dev-ml/calendar:=
+ dev-ml/camlp4:=
ppx? ( >=dev-ml/ppx_tools-0.99.3:= )"
DEPEND="${RDEPEND}
dev-ml/ocamlbuild
dev-ml/opam"
+src_prepare() {
+ if has_version '>=dev-lang/ocaml-4.03' ; then
+ epatch "${FILESDIR}/"{camlp4,oc43}.patch
+ fi
+}
+
src_compile() {
if use ocamlopt ; then
emake PPX=$(usex ppx true false) all
diff --git a/dev-ml/eliom/files/camlp4.patch b/dev-ml/eliom/files/camlp4.patch
new file mode 100644
index 000..59e94ab
--- /dev/null
+++ b/dev-ml/eliom/files/camlp4.patch
@@ -0,0 +1,48 @@
+commit f157a5b913451b85e8cfe7549c66e5c98669233b
+Author: Vasilis Papavasileiou
+Date: Wed Mar 2 14:23:02 2016 +0100
+
+Compile against Camlp4 4.02+7
+
+diff --git a/src/syntax/pa_eliom_seed.ml b/src/syntax/pa_eliom_seed.ml
+index c101ff8..dc31caa 100644
+--- a/src/syntax/pa_eliom_seed.ml
b/src/syntax/pa_eliom_seed.ml
+@@ -632,8 +632,26 @@ module Register(Id : sig val name: string end)(Pass :
Pass) = struct
+ | None ->
+ Printf.ksprintf (Syntax_error.raise loc) fmt
+
+-module E2 = Camlp4.ErrorHandler.Register(Syntax_error)
+-DELETE_RULE Gram expr: "{"; TRY [label_expr_list; "}"] END;
++module E2 = Camlp4.ErrorHandler.Register(Syntax_error) ;;
++
++try
++ DELETE_RULE Gram expr: "{"; TRY [label_expr_list; "}"] END
++with Camlp4.Struct.Grammar.Delete.Rule_not_found _ ->
++ (let test_record_field =
++ Gram.Entry.of_parser "record_field" (fun strm ->
++ let rec loop = function
++ | [] -> ()
++ | (UIDENT _, _) :: (KEYWORD ".", _) :: rest -> loop rest
++ | (LIDENT _, _) :: (KEYWORD "=", _) :: _-> ()
++ | (LIDENT _, _) :: (KEYWORD ";", _) :: _-> ()
++ | [LIDENT _, _] -> ()
++ | _ -> raise Stream.Failure
++ in
++ loop (Stream.npeek 100 strm))
++ in
++ DELETE_RULE Gram expr:
++ "{"; test_record_field; label_expr_list; "}" END) ;;
++
+ DELETE_RULE Gram expr: "{"; TRY [expr LEVEL "."; "with"];
label_expr_list; "}" END;
+
+ (* Extending syntax *)
+@@ -812,7 +830,7 @@ module Register(Id : sig val name: string end)(Pass :
Pass) = struct
+ expr: LEVEL "simple"
+
+ [ [ KEYWORD "{"; lel = TRY [lel = label_expr_list; "}" -> lel] ->
+- <:expr< { $lel$ } >>
++Ast.ExRec (_loc, lel, Ast.ExNil _loc)
+ | KEYWORD "{shared#";
+ typ = TRY [ typ = OPT ctyp; KEYWORD "{" -> typ];
+ opt_lvl = dummy_set_level_shared_value_expr ;
diff --git a/dev-ml/eliom/files/oc43.patch b/dev-ml/eliom/files/oc43.patch
new file mode 100644
index 000..07d2729
--- /dev/null
+++ b/dev-ml/eliom/files/oc43.patch
@@ -0,0 +1,37 @@
+Index: eliom-5.0.0/src/lib/eliom_lib.client.mli
+===
+--- eliom-5.0.0.orig/src/lib/eliom_lib.client.mli
eliom-5.0.0/src/lib/eliom_lib.client.mli
+@@ -43,7 +43,6 @@ type 'a shared_value = 'a
+
+ val create_shared_value : 'a -> 'a client_value -> 'a shared_value
+
+-exception Eliom_Internal_Error of string
+
+ (** This exception is raised (in Lwt) on the client if a call to a
+ server function {% < <:sig_item< >>
+ | si -> super#sig_item si
+ method ctyp ty = match ty with
[gentoo-commits] repo/gentoo:master commit in: dev-ml/eliom/, dev-ml/eliom/files/
commit: ad65b34eb91da0472da2906d65a125f60f9f7d69
Author: Alexis Ballier gentoo org>
AuthorDate: Tue Mar 1 18:24:11 2016 +
Commit: Alexis Ballier gentoo org>
CommitDate: Tue Mar 1 18:47:37 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad65b34e
dev-ml/eliom: remove old
Package-Manager: portage-2.2.27
Signed-off-by: Alexis Ballier gentoo.org>
dev-ml/eliom/Manifest| 1 -
dev-ml/eliom/eliom-4.2.ebuild| 60 ---
dev-ml/eliom/files/tyxml36.patch | 125 ---
3 files changed, 186 deletions(-)
diff --git a/dev-ml/eliom/Manifest b/dev-ml/eliom/Manifest
index d175232..23b75fd 100644
--- a/dev-ml/eliom/Manifest
+++ b/dev-ml/eliom/Manifest
@@ -1,2 +1 @@
-DIST eliom-4.2.tar.gz 699337 SHA256
30d180b72d21177d09b311785e08e54cc221b148d969f17334f8be6eecfb783d SHA512
c7c75dc00defe0c269aba4e4fbdc00a824b781b124e3f51747e29533c4aeedaecb68c7ebcb38b4cc9a51c3796abdfa680ba0702a83415911406b25cd07ad66c7
WHIRLPOOL
2a36deeb10cbf3b29c76b33185de1c848615293830f7a3701c2d87025be0ed575cdadf238c696ad4716e50f2b0258febef7b7039a1980aafeaf6e1c483ec46ca
DIST eliom-5.0.0.tar.gz 728278 SHA256
6726500f9a54478def95875d04098dc8dc829d4a10e06896ff4f037bb1c03cbd SHA512
1c5297e376c3a46935de369b418638a772304246b73756f8bc052301b48d62a37af527274bf1a05064f33b60ff9dcde057a0030f083136fa4e1c0cfa07f01887
WHIRLPOOL
ca1186787a8f938cf029f9a5c9904ed0324a3d24d2f0d0834dd1e2b2f995de6d57d1040b4d128de8233255ca385478f0ba3bf597c2f0315ab2f1894118755dca
diff --git a/dev-ml/eliom/eliom-4.2.ebuild b/dev-ml/eliom/eliom-4.2.ebuild
deleted file mode 100644
index 4f7efd7..000
--- a/dev-ml/eliom/eliom-4.2.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"
-
-RDEPEND=">=dev-lang/ocaml-4.00:=[ocamlopt?]
- >=dev-ml/js_of_ocaml-2.5-r1:=
- >=www-servers/ocsigenserver-2.5:=
- >=dev-ml/tyxml-3.6:=
- >=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:="
-DEPEND="${RDEPEND}
- dev-ml/opam"
-
-src_prepare() {
- epatch "${FILESDIR}/tyxml36.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/tyxml36.patch b/dev-ml/eliom/files/tyxml36.patch
deleted file mode 100644
index 02ac3f1..000
--- a/dev-ml/eliom/files/tyxml36.patch
+++ /dev/null
@@ -1,125 +0,0 @@
-Backported from:
-
-commit e2629e9affcaefbe9e0f36212fe3f385a780
-Author: Vasilis Papavasileiou
-Date: Thu Aug 6 13:23:29 2015 +0200
-
-update for new-style TyXML wrapping
-
-
-Index: eliom-4.2/src/lib/eliom_content.client.mli
-===
eliom-4.2.orig/src/lib/eliom_content.client.mli
-+++ eliom-4.2/src/lib/eliom_content.client.mli
-@@ -74,7 +74,7 @@ module Svg : sig
-
- (** Creation of reactive content *)
- module R : sig
--module Raw : Svg_sigs.MakeWrapped(Tyxml_js.Xml_wrap)(Xml).T
-+module Raw : Svg_sigs.Make(Eliom_content_core.Xml_wed).T
- with type +'a elt = 'a elt
-and type +'a attrib = 'a attrib
-
-@@ -397,7 +397,7 @@ module Html5 : sig
- val filter_attrib : 'a attrib -> bool React.signal -> 'a attrib
-
- (** Cf. {% <> %}. *)
--module Raw : Html5_sigs.MakeWrapped(Tyxml_js.Xml_wrap)(Xml)(Svg.R.Raw).T
-+module Raw : Html5_sigs.Make(Eliom_content_core.Xml_wed)(Svg.R.Raw).T
- with type +'a elt = 'a elt
-and type +'a attrib = 'a attrib
-
-Index: eliom-4.2/src/lib/eliom_content_core.client.ml
-===
eliom-4.2.orig/src/lib/eliom_content_core.client.ml
-+++ eliom-4.2/src/lib/eliom_content_core.client.ml
-@@ -26,6 +26,7 @@ open Eliom_lib
-
- module Xml = struct
- include RawXML
-+ module W = Xml_wrap.NoWrap
[gentoo-commits] repo/gentoo:master commit in: dev-ml/eliom/, dev-ml/eliom/files/
commit: 63883f105e1b97a4b5d3b90b35243459b4c74660
Author: Alexis Ballier gentoo org>
AuthorDate: Tue Jan 19 12:18:04 2016 +
Commit: Alexis Ballier gentoo org>
CommitDate: Tue Jan 19 12:18:04 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63883f10
dev-ml/eliom: backport upstream patch to build with tyxml 3.6
Package-Manager: portage-2.2.27
Signed-off-by: Alexis Ballier gentoo.org>
dev-ml/eliom/eliom-4.2.ebuild| 6 +-
dev-ml/eliom/files/tyxml36.patch | 125 +++
2 files changed, 130 insertions(+), 1 deletion(-)
diff --git a/dev-ml/eliom/eliom-4.2.ebuild b/dev-ml/eliom/eliom-4.2.ebuild
index 44f4cd5..4f7efd7 100644
--- a/dev-ml/eliom/eliom-4.2.ebuild
+++ b/dev-ml/eliom/eliom-4.2.ebuild
@@ -18,7 +18,7 @@ IUSE="doc +ocamlopt"
RDEPEND=">=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/tyxml-3.6:=
>=dev-ml/deriving-0.6:=
dev-ml/reactiveData:=
dev-ml/ocaml-ipaddr:=
@@ -29,6 +29,10 @@ RDEPEND=">=dev-lang/ocaml-4.00:=[ocamlopt?]
DEPEND="${RDEPEND}
dev-ml/opam"
+src_prepare() {
+ epatch "${FILESDIR}/tyxml36.patch"
+}
+
src_compile() {
if use ocamlopt ; then
emake all
diff --git a/dev-ml/eliom/files/tyxml36.patch b/dev-ml/eliom/files/tyxml36.patch
new file mode 100644
index 000..02ac3f1
--- /dev/null
+++ b/dev-ml/eliom/files/tyxml36.patch
@@ -0,0 +1,125 @@
+Backported from:
+
+commit e2629e9affcaefbe9e0f36212fe3f385a780
+Author: Vasilis Papavasileiou
+Date: Thu Aug 6 13:23:29 2015 +0200
+
+update for new-style TyXML wrapping
+
+
+Index: eliom-4.2/src/lib/eliom_content.client.mli
+===
+--- eliom-4.2.orig/src/lib/eliom_content.client.mli
eliom-4.2/src/lib/eliom_content.client.mli
+@@ -74,7 +74,7 @@ module Svg : sig
+
+ (** Creation of reactive content *)
+ module R : sig
+-module Raw : Svg_sigs.MakeWrapped(Tyxml_js.Xml_wrap)(Xml).T
++module Raw : Svg_sigs.Make(Eliom_content_core.Xml_wed).T
+ with type +'a elt = 'a elt
+and type +'a attrib = 'a attrib
+
+@@ -397,7 +397,7 @@ module Html5 : sig
+ val filter_attrib : 'a attrib -> bool React.signal -> 'a attrib
+
+ (** Cf. {% <> %}. *)
+-module Raw : Html5_sigs.MakeWrapped(Tyxml_js.Xml_wrap)(Xml)(Svg.R.Raw).T
++module Raw : Html5_sigs.Make(Eliom_content_core.Xml_wed)(Svg.R.Raw).T
+ with type +'a elt = 'a elt
+and type +'a attrib = 'a attrib
+
+Index: eliom-4.2/src/lib/eliom_content_core.client.ml
+===
+--- eliom-4.2.orig/src/lib/eliom_content_core.client.ml
eliom-4.2/src/lib/eliom_content_core.client.ml
+@@ -26,6 +26,7 @@ open Eliom_lib
+
+ module Xml = struct
+ include RawXML
++ module W = Xml_wrap.NoWrap
+ type 'a wrap = 'a
+ type 'a list_wrap = 'a list
+ type econtent =
+@@ -163,8 +164,9 @@ end
+
+ module Xml_wed =
+ struct
+- type 'a wrap = 'a Tyxml_js.Xml_wrap.t
+- type 'a list_wrap = 'a Tyxml_js.Xml_wrap.tlist
++ module W = Tyxml_js.Xml_wrap
++ type 'a wrap = 'a W.t
++ type 'a list_wrap = 'a W.tlist
+ type uri = Xml.uri
+ let string_of_uri = Xml.string_of_uri
+ let uri_of_string = Xml.uri_of_string
+@@ -250,7 +252,7 @@ module Svg = struct
+ end
+
+ module R = struct
+-module Raw = Svg_f.MakeWrapped(Tyxml_js.Xml_wrap)(Xml_wed)
++module Raw = Svg_f.Make(Xml_wed)
+ include Raw
+
+ end
+@@ -322,7 +324,7 @@ module Html5 = struct
+
+ let node s = Xml.make_react s
+
+-module Raw = Html5_f.MakeWrapped(Tyxml_js.Xml_wrap)(Xml_wed)(Svg.R)
++module Raw = Html5_f.Make(Xml_wed)(Svg.R)
+ let filter_attrib (name,a) on =
+ let v = match a with
+ | Xml.RA a -> Xml.RAReact (React.S.map (function
+Index: eliom-4.2/src/lib/eliom_content_core.client.mli
+===
+--- eliom-4.2.orig/src/lib/eliom_content_core.client.mli
eliom-4.2/src/lib/eliom_content_core.client.mli
+@@ -22,6 +22,8 @@
+
+ module Xml : sig
+
++ module W : Xml_wrap.T with type 'a t = 'a and type 'a tlist = 'a list
++
+ type uri = string
+ val uri_of_string : uri -> string
+ val string_of_uri : string -> uri
+@@ -147,6 +149,8 @@ module Xml : sig
+ val set_classes_of_elt : elt -> elt
+ end
+
++module Xml_wed : Xml_sigs.T with module W = Tyxml_js.Xml_wrap
++
+ (** Building SVG tree. *)
+ module Svg : sig
+
+@@ -197,7 +201,7 @@ module Svg : sig
+ (** Typed interface for building valid reactive SVG tree. *)
+ module R : sig
+
+-module Raw : Svg_sigs.MakeWrapped(Tyxml_js.Xml_wrap)(Xml).T
++module Raw : Svg_sigs.Make(Xml_wed).T
+ with type +'a elt = 'a elt
+and type +'a attrib = 'a attrib
+
+@@ -298,7 +302,7 @@ module Html5 : sig
+
+ val
