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_optcomp/Manifest | 5 +- .../files/ppx_optcomp-0.14.0-ppxlib-0.18.0.patch | 63 ++++++++++++++++++++++ dev-ml/ppx_optcomp/metadata.xml | 5 +- dev-ml/ppx_optcomp/ppx_optcomp-0.14.0.ebuild | 28 ++++++++++ 4 files changed, 99 insertions(+), 2 deletions(-) create mode 100644 dev-ml/ppx_optcomp/files/ppx_optcomp-0.14.0-ppxlib-0.18.0.patch create mode 100644 dev-ml/ppx_optcomp/ppx_optcomp-0.14.0.ebuild (limited to 'dev-ml/ppx_optcomp') diff --git a/dev-ml/ppx_optcomp/Manifest b/dev-ml/ppx_optcomp/Manifest index 3ec13caca8ad..5492b1850452 100644 --- a/dev-ml/ppx_optcomp/Manifest +++ b/dev-ml/ppx_optcomp/Manifest @@ -1,3 +1,6 @@ +AUX ppx_optcomp-0.14.0-ppxlib-0.18.0.patch 2581 BLAKE2B bf7f888acc462481e03a2d091e9a453d87f9173708c865c419d0d1e89dc315225196ac5e275de7957649ce7c09d056622998aeb3555b274c4e1e6c283193dd6f SHA512 cb50911a137c0fa0efcafdd9bd6cfa0e196c20816e7696bff7ad8aa81d015f18b534c8f0fdf47da0ce4289409cd5fd3b01ef051d3139fd30ac834d91a80ce47d +DIST ppx_optcomp-0.14.0.tar.gz 16583 BLAKE2B 9b139708e02501245d5440a862324fe0191c9c96772e6599ed474a734263c4d2c0fa08fff666abd2efb218ec03a2b9b47c5ef6480d53a8d0f280550b741ac39a SHA512 e86b108d805500cbd7be628f41436ec8de0e8622d4218631d01bf73b0e70da0a057b8531465206baa9b8851ce9c22c5cd53921fccfae352ee46527d69964dc44 DIST ppx_optcomp-0.9.0.tar.gz 14611 BLAKE2B 6fc431fd3ed173835a48814718a05b3ae619f182f4c008415dba77c88bfeab780e6fc49c4faed2ee4e362b6a151544b1a707651dcbfdbfcdce979a2a3d6d6c02 SHA512 ce4a5049045458533b783b99b7569e72e074bd425a81315d43fcab26dbc2a4b141cfda2b2365c69b3d0251f2bf0b8c8f0d14fc8883f1a0f4edae824776565a9c +EBUILD ppx_optcomp-0.14.0.ebuild 694 BLAKE2B 2f0b81c29854620fb4be914618e1d5bc8a5ede91250cee9ebcd9950e11ff4e317a7e607578e5d9cf604c3bad2026da8a67b954f0123309cda326d9c17306cb55 SHA512 939ca0bbf0b437ae8afb5f21a857d4a0e3f465f4b038eb4d810a86cc8d4af015fe69d2741c2b9f463cb6e1df8b9e029a633075b1e211d57433cef978c0d37f41 EBUILD ppx_optcomp-0.9.0-r3.ebuild 526 BLAKE2B 78ff4bbfdf7781a0ba8a6b6a5fd0b6f2b432c3f247d056a34a3ad4a2fd11fcb139b3d6ad46e166896f492fda9367fcbc0cc8180d5bbbac243cfa75e7ba5c4b99 SHA512 e61daab3a1868d7348ff05977bef647f6be54c4883789265f38dccfb3b8d9311b3c3599c59fa374ee8945454baf91634fa859ed060e04cb98457543aabdde967 -MISC metadata.xml 254 BLAKE2B e8b174fb629dd9c675bc12b7789454c91c8b2f689140c70345cff6e2ae8fd78c55963e983ccb922940cd82bca702e9c9fe3668dbecef06775038693c8b8d3f8c SHA512 f8061b6d24fbe6afdff7284e2fc85aeff0c10df1baf44639e329e7ff25b44d351d87c705307602936a98a6a0f3db78c0c5d0d6cb79b779d0816957db62a535e1 +MISC metadata.xml 331 BLAKE2B 849b5e0d1adf1511346568c3ed8cf159eebca2fa7162f6a128fb67c36e3025664ff8a2965c28aeec97deb37b237ef64af014b87119083a5ed0b2ab322f1f1251 SHA512 5743f8c155c33c49d6e9a3ae4def1849553c8ff74c30e0e0694fbf9a798c4cf74b6c1347596ad7a849d564b6aef2423ddf7fbe25df8f2114548753d5f727d6de diff --git a/dev-ml/ppx_optcomp/files/ppx_optcomp-0.14.0-ppxlib-0.18.0.patch b/dev-ml/ppx_optcomp/files/ppx_optcomp-0.14.0-ppxlib-0.18.0.patch new file mode 100644 index 000000000000..063b9df74aba --- /dev/null +++ b/dev-ml/ppx_optcomp/files/ppx_optcomp-0.14.0-ppxlib-0.18.0.patch @@ -0,0 +1,63 @@ +commit a4422ecd7e0677569533b1dae07924f5d786e8f6 (HEAD, origin/upgrade-ppxlib-0.18.0) +Author: Nathan Rebours +Date: Mon Oct 5 18:35:26 2020 +0200 + + Make ppx_optcomp 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_optcomp + 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/ppx_optcomp.opam b/ppx_optcomp.opam +index 20eb7c5..cbe8b5c 100644 +--- a/ppx_optcomp.opam ++++ b/ppx_optcomp.opam +@@ -15,7 +15,7 @@ depends: [ + "base" {>= "v0.14" & < "v0.15"} + "stdio" {>= "v0.14" & < "v0.15"} + "dune" {>= "2.0.0"} +- "ppxlib" {>= "0.11.0"} ++ "ppxlib" {>= "0.18.0"} + ] + synopsis: "Optional compilation for OCaml" + description: " +diff --git a/src/interpreter.ml b/src/interpreter.ml +index f1da14b..1c6d726 100644 +--- a/src/interpreter.ml ++++ b/src/interpreter.ml +@@ -241,7 +241,7 @@ let rec eval env e : Value.t = + match e.pexp_desc with + | Pexp_constant (Pconst_integer (x, None)) -> Int (parse_int loc x) + | Pexp_constant (Pconst_char x ) -> Char x +- | Pexp_constant (Pconst_string (x, _ )) -> String x ++ | Pexp_constant (Pconst_string (x, _, _ )) -> String x + + | Pexp_construct ({ txt = Lident "true" ; _ }, None) -> Bool true + | Pexp_construct ({ txt = Lident "false"; _ }, None) -> Bool false +@@ -361,7 +361,7 @@ and bind env patt value = + + | Ppat_constant (Pconst_integer (x, None)), Int y when parse_int loc x = y -> env + | Ppat_constant (Pconst_char x ), Char y when Char.equal x y -> env +- | Ppat_constant (Pconst_string (x, _ )), String y when String.equal x y -> env ++ | Ppat_constant (Pconst_string (x, _, _ )), String y when String.equal x y -> env + + | Ppat_construct ({ txt = Lident "true" ; _ }, None), Bool true -> env + | Ppat_construct ({ txt = Lident "false"; _ }, None), Bool false -> env +diff --git a/src/ppx_optcomp.ml b/src/ppx_optcomp.ml +index a2573de..d87ea24 100644 +--- a/src/ppx_optcomp.ml ++++ b/src/ppx_optcomp.ml +@@ -81,7 +81,7 @@ module Ast_utils = struct + let get_string ~loc payload = + let e = get_expr ~loc payload in + match e with +- | { pexp_desc = Pexp_constant (Pconst_string (x, _ )); _ } -> x ++ | { pexp_desc = Pexp_constant (Pconst_string (x, _, _ )); _ } -> x + | _ -> Location.raise_errorf ~loc "optcomp: invalid directive syntax, expected string" + + end diff --git a/dev-ml/ppx_optcomp/metadata.xml b/dev-ml/ppx_optcomp/metadata.xml index f45619ffca46..30b65cf1fd3a 100644 --- a/dev-ml/ppx_optcomp/metadata.xml +++ b/dev-ml/ppx_optcomp/metadata.xml @@ -1,7 +1,10 @@ - + + gienah@gentoo.org + Mark Wright + janestreet/ppx_optcomp diff --git a/dev-ml/ppx_optcomp/ppx_optcomp-0.14.0.ebuild b/dev-ml/ppx_optcomp/ppx_optcomp-0.14.0.ebuild new file mode 100644 index 000000000000..baf7b1c68d1d --- /dev/null +++ b/dev-ml/ppx_optcomp/ppx_optcomp-0.14.0.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="Optional compilation for OCaml" +HOMEPAGE="https://github.com/janestreet/ppx_optcomp" +SRC_URI="https://github.com/janestreet/ppx_optcomp/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/stdio-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