From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 022CE138222 for ; Tue, 3 May 2016 17:44:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7851C21C02C; Tue, 3 May 2016 17:44:38 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 0502321C008 for ; Tue, 3 May 2016 17:44:37 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1E84334098F for ; Tue, 3 May 2016 17:44:36 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9763C345 for ; Tue, 3 May 2016 17:44:32 +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: <1462297462.6f9ce785a4a5d5a9b4593d900557d23e4c81ac73.aballier@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ml/ppx_pipebang/files/, dev-ml/ppx_pipebang/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-ml/ppx_pipebang/files/oc43.patch dev-ml/ppx_pipebang/ppx_pipebang-113.33.00.ebuild X-VCS-Directories: dev-ml/ppx_pipebang/ dev-ml/ppx_pipebang/files/ X-VCS-Committer: aballier X-VCS-Committer-Name: Alexis Ballier X-VCS-Revision: 6f9ce785a4a5d5a9b4593d900557d23e4c81ac73 X-VCS-Branch: master Date: Tue, 3 May 2016 17:44:32 +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: 685cac9a-55c0-4f84-a671-b30bfd038c85 X-Archives-Hash: 43d87ac668237bf468d2edd8d0c74196 commit: 6f9ce785a4a5d5a9b4593d900557d23e4c81ac73 Author: Alexis Ballier gentoo org> AuthorDate: Tue May 3 16:29:56 2016 +0000 Commit: Alexis Ballier gentoo org> CommitDate: Tue May 3 17:44:22 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f9ce785 dev-ml/ppx_pipebang: fix build with ocaml 4.03 Package-Manager: portage-2.2.28 Signed-off-by: Alexis Ballier gentoo.org> dev-ml/ppx_pipebang/files/oc43.patch | 46 +++++++++++++++++++++++ dev-ml/ppx_pipebang/ppx_pipebang-113.33.00.ebuild | 4 ++ 2 files changed, 50 insertions(+) diff --git a/dev-ml/ppx_pipebang/files/oc43.patch b/dev-ml/ppx_pipebang/files/oc43.patch new file mode 100644 index 0000000..5f10fc0 --- /dev/null +++ b/dev-ml/ppx_pipebang/files/oc43.patch @@ -0,0 +1,46 @@ +diff -uNr ppx_pipebang-113.33.00/_oasis ppx_pipebang-113.33.00+4.03/_oasis +--- ppx_pipebang-113.33.00/_oasis 2016-03-09 16:44:54.000000000 +0100 ++++ ppx_pipebang-113.33.00+4.03/_oasis 2016-03-22 15:13:51.000000000 +0100 +@@ -1,8 +1,8 @@ + OASISFormat: 0.4 +-OCamlVersion: >= 4.02.3 ++OCamlVersion: >= 4.03.0 + FindlibVersion: >= 1.3.2 + Name: ppx_pipebang +-Version: 113.33.00 ++Version: 113.33.00+4.03 + Synopsis: A ppx rewriter that inlines reverse application operators `|>` and `|!` + Authors: Jane Street Group, LLC + Copyrights: (C) 2015-2016 Jane Street Group LLC +diff -uNr ppx_pipebang-113.33.00/opam ppx_pipebang-113.33.00+4.03/opam +--- ppx_pipebang-113.33.00/opam 2016-03-18 12:08:01.000000000 +0100 ++++ ppx_pipebang-113.33.00+4.03/opam 2016-03-22 17:51:37.000000000 +0100 +@@ -16,4 +16,4 @@ + "ppx_driver" + "ppx_tools" {>= "0.99.3"} + ] +-available: [ ocaml-version >= "4.02.3" ] ++available: [ ocaml-version >= "4.03.0" ] +diff -uNr ppx_pipebang-113.33.00/src/ppx_pipebang.ml ppx_pipebang-113.33.00+4.03/src/ppx_pipebang.ml +--- ppx_pipebang-113.33.00/src/ppx_pipebang.ml 2016-03-09 16:44:54.000000000 +0100 ++++ ppx_pipebang-113.33.00+4.03/src/ppx_pipebang.ml 2016-03-22 15:13:51.000000000 +0100 +@@ -11,16 +11,16 @@ + let loc = e.pexp_loc in + match e.pexp_desc with + | Pexp_apply ({ pexp_desc = Pexp_ident { txt = Lident ("|!" | "|>"); _ }; _ }, +- [("", x); ("", y)]) -> begin ++ [(Nolabel, x); (Nolabel, y)]) -> begin + let x = self#expression x in + let y = self#expression y in + match y with + | { pexp_desc = Pexp_construct (id, None); _ } -> + { y with pexp_desc = Pexp_construct (id, Some x) } + | { pexp_desc = Pexp_apply (f, args); pexp_attributes = []; _ } -> +- { e with pexp_desc = Pexp_apply (f, args @ [("", x)]) } ++ { e with pexp_desc = Pexp_apply (f, args @ [(Nolabel, x)]) } + | _ -> +- { e with pexp_desc = Pexp_apply (y, [("", x)]) } ++ { e with pexp_desc = Pexp_apply (y, [(Nolabel, x)]) } + end + | Pexp_ident { txt = Lident ("|!" | "|>" as s); _ } -> + Location.raise_errorf ~loc "%s must be applied to two arguments" s diff --git a/dev-ml/ppx_pipebang/ppx_pipebang-113.33.00.ebuild b/dev-ml/ppx_pipebang/ppx_pipebang-113.33.00.ebuild index ae35794..867ca54 100644 --- a/dev-ml/ppx_pipebang/ppx_pipebang-113.33.00.ebuild +++ b/dev-ml/ppx_pipebang/ppx_pipebang-113.33.00.ebuild @@ -22,6 +22,10 @@ DEPEND="dev-ml/ppx_tools:= RDEPEND="${DEPEND}" DEPEND="${DEPEND} dev-ml/opam" +src_prepare() { + has_version '>=dev-lang/ocaml-4.03' && epatch "${FILESDIR}/oc43.patch" +} + src_configure() { emake setup.exe OASIS_SETUP_COMMAND="./setup.exe" oasis_src_configure