From d934827bf44b7cfcf6711964418148fa60877668 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 25 Nov 2020 22:39:15 +0000 Subject: gentoo resync : 25.11.2020 --- dev-ml/ppx_sexp_message/Manifest | 5 ++- .../ppx_sexp_message-0.14.0-ppxlib-0.18.0.patch | 41 ++++++++++++++++++++++ dev-ml/ppx_sexp_message/metadata.xml | 5 ++- .../ppx_sexp_message-0.14.0.ebuild | 29 +++++++++++++++ 4 files changed, 78 insertions(+), 2 deletions(-) create mode 100644 dev-ml/ppx_sexp_message/files/ppx_sexp_message-0.14.0-ppxlib-0.18.0.patch create mode 100644 dev-ml/ppx_sexp_message/ppx_sexp_message-0.14.0.ebuild (limited to 'dev-ml/ppx_sexp_message') diff --git a/dev-ml/ppx_sexp_message/Manifest b/dev-ml/ppx_sexp_message/Manifest index f41be4a9a0de..2bda753b7930 100644 --- a/dev-ml/ppx_sexp_message/Manifest +++ b/dev-ml/ppx_sexp_message/Manifest @@ -1,3 +1,6 @@ +AUX ppx_sexp_message-0.14.0-ppxlib-0.18.0.patch 1680 BLAKE2B 0e5af99fccc4cbce9edc29b2f97c93816b7d07f05930e9f64f109c669391fcb745f226335b369221ce704d8c572ae46713446a5c5d4d9ad15bb0657717dd794c SHA512 bdd8677849346b9c1a20991477e84ccc0a886d668008a5bd6febc48603faf649d7c333536a587dfc4c0212802a73e0f7a17e1e0b61ba8168768b8bdb03c6c95c +DIST ppx_sexp_message-0.14.0.tar.gz 7738 BLAKE2B a00577faf55b0816991bfe6f11fdc21d9b56893c29e67036483adce56c095cb8a2ee9014f9f0768ab96bbd28fe2f46b262e8a6122cf66ccb2740af7be890db0d SHA512 627f8e52914ef228277ff31a0d2262de823767fa0b510b1a29cbfc754c7cbc84cabe7c94de3e3a72d888d19e23584ebcc46c16997ffd7cdae41378cb44b2bc23 DIST ppx_sexp_message-0.9.0.tar.gz 8965 BLAKE2B df59ff7f598a7ff19a16829addbc5b49f2e7dfb2b30aab43f5d220f6d45f625750ca1d63eba3187b09d494a2c06af642c2a2e4d581c6a247440ba06d6f46dae0 SHA512 38a376b23372b8699fef76085ad2ead7b5fb34b823b0c7e3e52ac90654133a44429d7a3383197b78c8f01a7b64753ce424d5138b8aef596d236ce9c798ec1887 +EBUILD ppx_sexp_message-0.14.0.ebuild 752 BLAKE2B 7f7ebbacfd031e5759edf9fcf0cdfda80792f3121455191c5d49862c55a15d997fa3240cbd0206f7bcc18ef343c4c0119e0cd22bdc19c0c0ac9f2328bc0f611b SHA512 a698423b290759a48a1d653108678870076347dcee8aa1864df288efa3a32c723cf6c141e8f7924624863f3c90e5950f1a4da0ca72c211afa7e1133058f7ebd4 EBUILD ppx_sexp_message-0.9.0.ebuild 627 BLAKE2B 85780c5fd9fca2ea855128218368f7440e3c1f82495521df568bc9e5f2585362eeeb3f9623468f67b15f701b72d36ccf445464cd65d2dec8d55a6dba95041e88 SHA512 4f8d7cff0f326aab6e58498a151bc8404861a8e00de01d821e1654b8aefd6f2a9cc4d9b059a9c5954815aadf12d202dd6c9eb7bd052d53fbc71efa8454ac7157 -MISC metadata.xml 259 BLAKE2B 014198d6394d58358c22eb106d648e2c9ba32d42e9bb016c5cfa40abd830a6f525d9a8f3eba08d868a97d06e9ad5459b5a1c8a266ca94a12aa4add23616e72f4 SHA512 0445833a41f98e2291ac25f61e995c5ba2c1034777a9eb3f4334fdcffa8b8fd06a2bc5c04f575dedbe737434bd3c17c21f476ea03600a56f9e6432392e8b2ff6 +MISC metadata.xml 336 BLAKE2B a45b57026388e3f2fe8e287bd04c2eb6303d48ad5105853f4700d51bdc118029fed73463e88068af76e520569f4183761c163e9b8bdbb4b6b2941d305f8067cf SHA512 f47319f87ec2fbda8fe70a65e99a427a86711ed75d57ab7365fac6050d00ec919139be5eeb2b3cf7ed82defe6daa65743cbbbb3e9cce3e0dcd122965cfde24d6 diff --git a/dev-ml/ppx_sexp_message/files/ppx_sexp_message-0.14.0-ppxlib-0.18.0.patch b/dev-ml/ppx_sexp_message/files/ppx_sexp_message-0.14.0-ppxlib-0.18.0.patch new file mode 100644 index 000000000000..a472c5ab29a1 --- /dev/null +++ b/dev-ml/ppx_sexp_message/files/ppx_sexp_message-0.14.0-ppxlib-0.18.0.patch @@ -0,0 +1,41 @@ +commit fd604b269398aebdb0c5fa5511d9f3c38b6ecb45 (HEAD, origin/upgrade-ppxlib-0.18.0) +Author: Nathan Rebours +Date: Mon Oct 5 18:04:41 2020 +0200 + + Make ppx_sexp_message compatible with ppxlib.0.18.0 + + ppxlib.0.18.0 upgrades to the 4.11 AST which results in a change + in string constants representation. This PR makes ppx_sexp_message + compatible with the latest ppxlib. + + You might want for the actual release of ppxlib.0.18.0 before merging + this! + + Signed-off-by: Nathan Rebours + +diff --git a/expander/ppx_sexp_message_expander.ml b/expander/ppx_sexp_message_expander.ml +index e0c2477..c801cd7 100644 +--- a/expander/ppx_sexp_message_expander.ml ++++ b/expander/ppx_sexp_message_expander.ml +@@ -97,7 +97,7 @@ let sexp_of_expr ~omit_nil e = + let e = rewrite_here e in + let loc = { e.pexp_loc with loc_ghost = true } in + match e.pexp_desc with +- | Pexp_constant (Pconst_string ("", _)) -> Absent ++ | Pexp_constant (Pconst_string ("", _, _)) -> Absent + | Pexp_constant const -> + present_or_omit_nil ~loc ~omit_nil:false (sexp_of_constant ~loc const) + | Pexp_constraint (expr, ctyp) -> sexp_of_constraint ~omit_nil ~loc expr ctyp +diff --git a/ppx_sexp_message.opam b/ppx_sexp_message.opam +index d8a6d95..3d6ef41 100644 +--- a/ppx_sexp_message.opam ++++ b/ppx_sexp_message.opam +@@ -16,7 +16,7 @@ depends: [ + "ppx_here" {>= "v0.14" & < "v0.15"} + "ppx_sexp_conv" {>= "v0.14" & < "v0.15"} + "dune" {>= "2.0.0"} +- "ppxlib" {>= "0.11.0"} ++ "ppxlib" {>= "0.18.0"} + ] + synopsis: "A ppx rewriter for easy construction of s-expressions" + description: " diff --git a/dev-ml/ppx_sexp_message/metadata.xml b/dev-ml/ppx_sexp_message/metadata.xml index 715559feb2c9..2f418c1a3acf 100644 --- a/dev-ml/ppx_sexp_message/metadata.xml +++ b/dev-ml/ppx_sexp_message/metadata.xml @@ -1,7 +1,10 @@ - + + gienah@gentoo.org + Mark Wright + janestreet/ppx_sexp_message diff --git a/dev-ml/ppx_sexp_message/ppx_sexp_message-0.14.0.ebuild b/dev-ml/ppx_sexp_message/ppx_sexp_message-0.14.0.ebuild new file mode 100644 index 000000000000..5e36fc89d1ae --- /dev/null +++ b/dev-ml/ppx_sexp_message/ppx_sexp_message-0.14.0.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="A ppx rewriter for easy construction of s-expressions" +HOMEPAGE="https://github.com/janestreet/ppx_sexp_message" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" +IUSE="+ocamlopt" + +DEPEND=" + >=dev-ml/base-0.14.0:= + dev-ml/findlib:= + >=dev-ml/ppx_here-0.14.0:= + >=dev-ml/ppx_sexp_conv-0.14.0:= + >=dev-ml/ppxlib-0.18.0:= + >=dev-ml/ocaml-compiler-libs-0.11.0:= + >=dev-ml/ocaml-migrate-parsetree-2.0.0:= + dev-ml/cinaps:= +" +RDEPEND="${DEPEND}" + +PATCHES=( "${FILESDIR}"/${P}-ppxlib-0.18.0.patch ) -- cgit v1.2.3