Gentoo Archives: gentoo-commits

From: Alexis Ballier <aballier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ml/eliom/, dev-ml/eliom/files/
Date: Tue, 01 Mar 2016 18:48:23
Message-Id: 1456858057.ad65b34eb91da0472da2906d65a125f60f9f7d69.aballier@gentoo
1 commit: ad65b34eb91da0472da2906d65a125f60f9f7d69
2 Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
3 AuthorDate: Tue Mar 1 18:24:11 2016 +0000
4 Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
5 CommitDate: Tue Mar 1 18:47:37 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad65b34e
7
8 dev-ml/eliom: remove old
9
10 Package-Manager: portage-2.2.27
11 Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>
12
13 dev-ml/eliom/Manifest | 1 -
14 dev-ml/eliom/eliom-4.2.ebuild | 60 -------------------
15 dev-ml/eliom/files/tyxml36.patch | 125 ---------------------------------------
16 3 files changed, 186 deletions(-)
17
18 diff --git a/dev-ml/eliom/Manifest b/dev-ml/eliom/Manifest
19 index d175232..23b75fd 100644
20 --- a/dev-ml/eliom/Manifest
21 +++ b/dev-ml/eliom/Manifest
22 @@ -1,2 +1 @@
23 -DIST eliom-4.2.tar.gz 699337 SHA256 30d180b72d21177d09b311785e08e54cc221b148d969f17334f8be6eecfb783d SHA512 c7c75dc00defe0c269aba4e4fbdc00a824b781b124e3f51747e29533c4aeedaecb68c7ebcb38b4cc9a51c3796abdfa680ba0702a83415911406b25cd07ad66c7 WHIRLPOOL 2a36deeb10cbf3b29c76b33185de1c848615293830f7a3701c2d87025be0ed575cdadf238c696ad4716e50f2b0258febef7b7039a1980aafeaf6e1c483ec46ca
24 DIST eliom-5.0.0.tar.gz 728278 SHA256 6726500f9a54478def95875d04098dc8dc829d4a10e06896ff4f037bb1c03cbd SHA512 1c5297e376c3a46935de369b418638a772304246b73756f8bc052301b48d62a37af527274bf1a05064f33b60ff9dcde057a0030f083136fa4e1c0cfa07f01887 WHIRLPOOL ca1186787a8f938cf029f9a5c9904ed0324a3d24d2f0d0834dd1e2b2f995de6d57d1040b4d128de8233255ca385478f0ba3bf597c2f0315ab2f1894118755dca
25
26 diff --git a/dev-ml/eliom/eliom-4.2.ebuild b/dev-ml/eliom/eliom-4.2.ebuild
27 deleted file mode 100644
28 index 4f7efd7..0000000
29 --- a/dev-ml/eliom/eliom-4.2.ebuild
30 +++ /dev/null
31 @@ -1,60 +0,0 @@
32 -# Copyright 1999-2015 Gentoo Foundation
33 -# Distributed under the terms of the GNU General Public License v2
34 -# $Id$
35 -
36 -EAPI=5
37 -
38 -inherit eutils multilib findlib
39 -
40 -DESCRIPTION="A web framework to program client/server applications"
41 -HOMEPAGE="http://ocsigen.org/eliom/"
42 -SRC_URI="https://github.com/ocsigen/eliom/archive/${PV}.tar.gz -> ${P}.tar.gz"
43 -
44 -LICENSE="LGPL-2.1-with-linking-exception"
45 -SLOT="0/${PV}"
46 -KEYWORDS="~amd64"
47 -IUSE="doc +ocamlopt"
48 -
49 -RDEPEND=">=dev-lang/ocaml-4.00:=[ocamlopt?]
50 - >=dev-ml/js_of_ocaml-2.5-r1:=
51 - >=www-servers/ocsigenserver-2.5:=
52 - >=dev-ml/tyxml-3.6:=
53 - >=dev-ml/deriving-0.6:=
54 - dev-ml/reactiveData:=
55 - dev-ml/ocaml-ipaddr:=
56 - dev-ml/react:=
57 - dev-ml/ocaml-ssl:=
58 - >=dev-ml/lwt-2.5.0:=
59 - dev-ml/calendar:="
60 -DEPEND="${RDEPEND}
61 - dev-ml/opam"
62 -
63 -src_prepare() {
64 - epatch "${FILESDIR}/tyxml36.patch"
65 -}
66 -
67 -src_compile() {
68 - if use ocamlopt ; then
69 - emake all
70 - else
71 - emake byte
72 - fi
73 - use doc && emake doc
74 - emake man
75 -}
76 -
77 -src_install() {
78 - opam-installer \
79 - --prefix="${ED}/usr" \
80 - --libdir="${D}/$(ocamlc -where)" \
81 - --docdir="${ED}/usr/share/doc/${PF}" \
82 - --mandir="${ED}/usr/share/man" \
83 - || die
84 - dodoc CHANGES README
85 - if use doc ; then
86 - docinto client/html
87 - dodoc -r _build/src/lib/client/api.docdir/*
88 - docinto server/html
89 - dodoc -r _build/src/lib/server/api.docdir/*
90 - fi
91 -}
92
93 diff --git a/dev-ml/eliom/files/tyxml36.patch b/dev-ml/eliom/files/tyxml36.patch
94 deleted file mode 100644
95 index 02ac3f1..0000000
96 --- a/dev-ml/eliom/files/tyxml36.patch
97 +++ /dev/null
98 @@ -1,125 +0,0 @@
99 -Backported from:
100 -
101 -commit e55552629e9affcaefbe9e0f36212fe3f385a780
102 -Author: Vasilis Papavasileiou <git@×××××××××××××××.net>
103 -Date: Thu Aug 6 13:23:29 2015 +0200
104 -
105 - update for new-style TyXML wrapping
106 -
107 -
108 -Index: eliom-4.2/src/lib/eliom_content.client.mli
109 -===================================================================
110 ---- eliom-4.2.orig/src/lib/eliom_content.client.mli
111 -+++ eliom-4.2/src/lib/eliom_content.client.mli
112 -@@ -74,7 +74,7 @@ module Svg : sig
113 -
114 - (** Creation of reactive content *)
115 - module R : sig
116 -- module Raw : Svg_sigs.MakeWrapped(Tyxml_js.Xml_wrap)(Xml).T
117 -+ module Raw : Svg_sigs.Make(Eliom_content_core.Xml_wed).T
118 - with type +'a elt = 'a elt
119 - and type +'a attrib = 'a attrib
120 -
121 -@@ -397,7 +397,7 @@ module Html5 : sig
122 - val filter_attrib : 'a attrib -> bool React.signal -> 'a attrib
123 -
124 - (** Cf. {% <<a_api project="tyxml" | module Html5_sigs.T >> %}. *)
125 -- module Raw : Html5_sigs.MakeWrapped(Tyxml_js.Xml_wrap)(Xml)(Svg.R.Raw).T
126 -+ module Raw : Html5_sigs.Make(Eliom_content_core.Xml_wed)(Svg.R.Raw).T
127 - with type +'a elt = 'a elt
128 - and type +'a attrib = 'a attrib
129 -
130 -Index: eliom-4.2/src/lib/eliom_content_core.client.ml
131 -===================================================================
132 ---- eliom-4.2.orig/src/lib/eliom_content_core.client.ml
133 -+++ eliom-4.2/src/lib/eliom_content_core.client.ml
134 -@@ -26,6 +26,7 @@ open Eliom_lib
135 -
136 - module Xml = struct
137 - include RawXML
138 -+ module W = Xml_wrap.NoWrap
139 - type 'a wrap = 'a
140 - type 'a list_wrap = 'a list
141 - type econtent =
142 -@@ -163,8 +164,9 @@ end
143 -
144 - module Xml_wed =
145 - struct
146 -- type 'a wrap = 'a Tyxml_js.Xml_wrap.t
147 -- type 'a list_wrap = 'a Tyxml_js.Xml_wrap.tlist
148 -+ module W = Tyxml_js.Xml_wrap
149 -+ type 'a wrap = 'a W.t
150 -+ type 'a list_wrap = 'a W.tlist
151 - type uri = Xml.uri
152 - let string_of_uri = Xml.string_of_uri
153 - let uri_of_string = Xml.uri_of_string
154 -@@ -250,7 +252,7 @@ module Svg = struct
155 - end
156 -
157 - module R = struct
158 -- module Raw = Svg_f.MakeWrapped(Tyxml_js.Xml_wrap)(Xml_wed)
159 -+ module Raw = Svg_f.Make(Xml_wed)
160 - include Raw
161 -
162 - end
163 -@@ -322,7 +324,7 @@ module Html5 = struct
164 -
165 - let node s = Xml.make_react s
166 -
167 -- module Raw = Html5_f.MakeWrapped(Tyxml_js.Xml_wrap)(Xml_wed)(Svg.R)
168 -+ module Raw = Html5_f.Make(Xml_wed)(Svg.R)
169 - let filter_attrib (name,a) on =
170 - let v = match a with
171 - | Xml.RA a -> Xml.RAReact (React.S.map (function
172 -Index: eliom-4.2/src/lib/eliom_content_core.client.mli
173 -===================================================================
174 ---- eliom-4.2.orig/src/lib/eliom_content_core.client.mli
175 -+++ eliom-4.2/src/lib/eliom_content_core.client.mli
176 -@@ -22,6 +22,8 @@
177 -
178 - module Xml : sig
179 -
180 -+ module W : Xml_wrap.T with type 'a t = 'a and type 'a tlist = 'a list
181 -+
182 - type uri = string
183 - val uri_of_string : uri -> string
184 - val string_of_uri : string -> uri
185 -@@ -147,6 +149,8 @@ module Xml : sig
186 - val set_classes_of_elt : elt -> elt
187 - end
188 -
189 -+module Xml_wed : Xml_sigs.T with module W = Tyxml_js.Xml_wrap
190 -+
191 - (** Building SVG tree. *)
192 - module Svg : sig
193 -
194 -@@ -197,7 +201,7 @@ module Svg : sig
195 - (** Typed interface for building valid reactive SVG tree. *)
196 - module R : sig
197 -
198 -- module Raw : Svg_sigs.MakeWrapped(Tyxml_js.Xml_wrap)(Xml).T
199 -+ module Raw : Svg_sigs.Make(Xml_wed).T
200 - with type +'a elt = 'a elt
201 - and type +'a attrib = 'a attrib
202 -
203 -@@ -298,7 +302,7 @@ module Html5 : sig
204 -
205 - val filter_attrib : 'a attrib -> bool React.signal -> 'a attrib
206 -
207 -- module Raw : Html5_sigs.MakeWrapped(Tyxml_js.Xml_wrap)(Xml)(Svg.R.Raw).T
208 -+ module Raw : Html5_sigs.Make(Xml_wed)(Svg.R.Raw).T
209 - with type +'a elt = 'a elt
210 - and type +'a attrib = 'a attrib
211 -
212 -Index: eliom-4.2/src/lib/eliom_content_core.server.ml
213 -===================================================================
214 ---- eliom-4.2.orig/src/lib/eliom_content_core.server.ml
215 -+++ eliom-4.2/src/lib/eliom_content_core.server.ml
216 -@@ -28,6 +28,7 @@ open Eliom_lib
217 -
218 - module Xml = struct
219 - include RawXML
220 -+ module W = Xml_wrap.NoWrap
221 - type 'a wrap = 'a
222 - type 'a list_wrap = 'a list
223 -