commit: 5f0dbdf6b728cfc22bcc62db3cca161f8cc2796d Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> AuthorDate: Tue Jan 19 12:06:52 2016 +0000 Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> CommitDate: Tue Jan 19 12:06:52 2016 +0000 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 <aballier <AT> 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..0000000 --- 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..0000000 --- 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 - 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/eliom-4.1.0.ebuild b/dev-ml/eliom/eliom-4.1.0.ebuild deleted file mode 100644 index c550f69..0000000 --- a/dev-ml/eliom/eliom-4.1.0.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2014 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/calendar:=" -RDEPEND="${DEPEND} - dev-ml/opam" - -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}" \ - || 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 deleted file mode 100644 index 8f3546e..0000000 --- a/dev-ml/eliom/files/lwt.patch +++ /dev/null @@ -1,70 +0,0 @@ -commit 107338c381b6a489c24c2dc9874de028a2cd08a3 -Author: Drup <drup...@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)
