From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 27021139694 for ; Wed, 12 Apr 2017 19:20:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 86490E0DDB; Wed, 12 Apr 2017 19:20:55 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 55EBBE0DDB for ; Wed, 12 Apr 2017 19:20:55 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1AD03341675 for ; Wed, 12 Apr 2017 19:20:39 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B9D78743A for ; Wed, 12 Apr 2017 19:20:35 +0000 (UTC) From: "Alexis Ballier" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexis Ballier" Message-ID: <1492024825.133e85b7d6febf3cf64a03dcca57c97974d255d7.aballier@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ml/eliom/files/, dev-ml/eliom/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-ml/eliom/eliom-6.2.0.ebuild dev-ml/eliom/eliom-9999.ebuild dev-ml/eliom/files/lwt3.patch X-VCS-Directories: dev-ml/eliom/files/ dev-ml/eliom/ X-VCS-Committer: aballier X-VCS-Committer-Name: Alexis Ballier X-VCS-Revision: 133e85b7d6febf3cf64a03dcca57c97974d255d7 X-VCS-Branch: master Date: Wed, 12 Apr 2017 19:20:35 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: adacaed3-938f-4ee6-9a83-8f75a1be221d X-Archives-Hash: 8f533dc5f83fe1c7dfa20da8226b1bde commit: 133e85b7d6febf3cf64a03dcca57c97974d255d7 Author: Alexis Ballier gentoo org> AuthorDate: Wed Apr 12 18:51:46 2017 +0000 Commit: Alexis Ballier gentoo org> CommitDate: Wed Apr 12 19:20:25 2017 +0000 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-9999.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-9999.ebuild b/dev-ml/eliom/eliom-9999.ebuild index 74e7e33453c..42b48b1abdd 100644 --- a/dev-ml/eliom/eliom-9999.ebuild +++ b/dev-ml/eliom/eliom-9999.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 00000000000..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)