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 8F61758973 for ; Mon, 8 Feb 2016 13:36:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 52E1A21C147; Mon, 8 Feb 2016 13:36:19 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9714C21C039 for ; Mon, 8 Feb 2016 13:36:18 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7D65F340942 for ; Mon, 8 Feb 2016 13:36:17 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CDCE41069 for ; Mon, 8 Feb 2016 13:36:15 +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: <1454938568.d36e0b0a0fd6bf3fd886ed9165a5a923e6de0c3a.aballier@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ml/ocaml-cstruct/files/, dev-ml/ocaml-cstruct/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-ml/ocaml-cstruct/files/sexpl.patch dev-ml/ocaml-cstruct/ocaml-cstruct-1.7.1.ebuild X-VCS-Directories: dev-ml/ocaml-cstruct/files/ dev-ml/ocaml-cstruct/ X-VCS-Committer: aballier X-VCS-Committer-Name: Alexis Ballier X-VCS-Revision: d36e0b0a0fd6bf3fd886ed9165a5a923e6de0c3a X-VCS-Branch: master Date: Mon, 8 Feb 2016 13:36:15 +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: 424886d3-123f-466e-83d9-86f75c001562 X-Archives-Hash: f46bf86a790f11589cfc1bb419c34f36 commit: d36e0b0a0fd6bf3fd886ed9165a5a923e6de0c3a Author: Alexis Ballier gentoo org> AuthorDate: Mon Feb 8 13:26:52 2016 +0000 Commit: Alexis Ballier gentoo org> CommitDate: Mon Feb 8 13:36:08 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d36e0b0a dev-ml/ocaml-cstruct: port to pa_sexp_conv and avoid requiring old sexplib Package-Manager: portage-2.2.27 Signed-off-by: Alexis Ballier gentoo.org> dev-ml/ocaml-cstruct/files/sexpl.patch | 85 +++++++++++++++++++++++++ dev-ml/ocaml-cstruct/ocaml-cstruct-1.7.1.ebuild | 3 +- 2 files changed, 87 insertions(+), 1 deletion(-) diff --git a/dev-ml/ocaml-cstruct/files/sexpl.patch b/dev-ml/ocaml-cstruct/files/sexpl.patch new file mode 100644 index 0000000..d87ca10 --- /dev/null +++ b/dev-ml/ocaml-cstruct/files/sexpl.patch @@ -0,0 +1,85 @@ +Index: ocaml-cstruct-1.7.1/_tags +=================================================================== +--- ocaml-cstruct-1.7.1.orig/_tags ++++ ocaml-cstruct-1.7.1/_tags +@@ -23,12 +23,12 @@ true: annot, bin_annot + : pkg_ocplib-endian + : pkg_ocplib-endian.bigstring + : pkg_sexplib +-: pkg_sexplib.syntax ++: pkg_pa_sexp_conv.syntax + "lib/cstruct_stubs.c": pkg_bigarray + "lib/cstruct_stubs.c": pkg_ocplib-endian + "lib/cstruct_stubs.c": pkg_ocplib-endian.bigstring + "lib/cstruct_stubs.c": pkg_sexplib +-"lib/cstruct_stubs.c": pkg_sexplib.syntax ++"lib/cstruct_stubs.c": pkg_pa_sexp_conv.syntax + # Library async_cstruct + "async/async_cstruct.cmxs": use_async_cstruct + : pkg_async +@@ -36,7 +36,7 @@ true: annot, bin_annot + : pkg_ocplib-endian + : pkg_ocplib-endian.bigstring + : pkg_sexplib +-: pkg_sexplib.syntax ++: pkg_pa_sexp_conv.syntax + : pkg_threads + : use_cstruct + # Library lwt_cstruct +@@ -46,7 +46,7 @@ true: annot, bin_annot + : pkg_ocplib-endian + : pkg_ocplib-endian.bigstring + : pkg_sexplib +-: pkg_sexplib.syntax ++: pkg_pa_sexp_conv.syntax + : use_cstruct + # Library unix_cstruct + "unix/unix_cstruct.cmxs": use_unix_cstruct +@@ -54,7 +54,7 @@ true: annot, bin_annot + : pkg_ocplib-endian + : pkg_ocplib-endian.bigstring + : pkg_sexplib +-: pkg_sexplib.syntax ++: pkg_pa_sexp_conv.syntax + : pkg_unix + : use_cstruct + # Library cstruct-syntax +@@ -69,7 +69,7 @@ true: annot, bin_annot + : pkg_ocplib-endian + : pkg_ocplib-endian.bigstring + : pkg_sexplib +-: pkg_sexplib.syntax ++: pkg_pa_sexp_conv + : pkg_unix + : use_cstruct + : use_unix_cstruct +@@ -82,14 +82,14 @@ true: annot, bin_annot + : pkg_ocplib-endian + : pkg_ocplib-endian.bigstring + : pkg_sexplib +-: pkg_sexplib.syntax ++: pkg_pa_sexp_conv + : use_cstruct + : pkg_bigarray + : pkg_oUnit + : pkg_ocplib-endian + : pkg_ocplib-endian.bigstring + : pkg_sexplib +-: pkg_sexplib.syntax ++: pkg_pa_sexp_conv + : use_cstruct + : custom + # OASIS_STOP +Index: ocaml-cstruct-1.7.1/setup.ml +=================================================================== +--- ocaml-cstruct-1.7.1.orig/setup.ml ++++ ocaml-cstruct-1.7.1/setup.ml +@@ -7003,7 +7003,7 @@ let setup_t = + FindlibPackage ("ocplib-endian", None); + FindlibPackage ("ocplib-endian.bigstring", None); + FindlibPackage ("sexplib", None); +- FindlibPackage ("sexplib.syntax", None) ++ FindlibPackage ("pa_sexp_conv.syntax", None) + ]; + bs_build_tools = [ExternalTool "ocamlbuild"]; + bs_c_sources = ["cstruct_stubs.c"]; diff --git a/dev-ml/ocaml-cstruct/ocaml-cstruct-1.7.1.ebuild b/dev-ml/ocaml-cstruct/ocaml-cstruct-1.7.1.ebuild index 118537c..6591ede 100644 --- a/dev-ml/ocaml-cstruct/ocaml-cstruct-1.7.1.ebuild +++ b/dev-ml/ocaml-cstruct/ocaml-cstruct-1.7.1.ebuild @@ -24,13 +24,14 @@ RDEPEND=" >=dev-lang/ocaml-4.01:= dev-ml/ocplib-endian:= dev-ml/sexplib:= -