dev-ml/ppx_expect: Bump to 0.14.0

Co-Author: Alexis Ballier <aballier@gentoo.org>
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Mark Wright <gienah@gentoo.org>

4 files changed, 87 insertions, 1 deletions

diff --git a/dev-ml/ppx_expect/Manifest b/dev-ml/ppx_expect/Manifest
index 4d417a085e81..c6b1189dc2e0 100644
--- a/dev-ml/ppx_expect/Manifest
+++ b/dev-ml/ppx_expect/Manifest
@@ -1 +1,2 @@
+DIST ppx_expect-0.14.0.tar.gz 45661 BLAKE2B 0cba3840743d45f0f11936f090319aab3237c7a14389eb6d035a3b7cdac91e0b169c3ed84407e1bb01a00738bf97b62dba313965e93a2177388666764fe5854b SHA512 7de5d84640d16101d38140b5f621301c9935e3161a7c7d978373940be92fa7f14cad429e79eec294a20d1f379e969cf3c25d15810f1a4d3ad1bb8ba0eb7d7109
 DIST ppx_expect-0.9.0.tar.gz 33700 BLAKE2B f03d1183b12efe84016a15b6a6b45b7bef93b23bc4d470c2796361aca2be229fc9447103c0a31d95a94f6c05bbabf1cbe9d138dc3518df9f505b6b009eefb104 SHA512 b8a6941f3ac0dea2167d7fe5c61e7adf605f5399e11049b5c9f22c613182983a014d05c2fb16e7a2dc94dbccf445e1801c39a89e6d995b5599cb40ee4322148e
diff --git a/dev-ml/ppx_expect/files/ppx_expect-0.14.0-ppxlib-0.18.0.patch b/dev-ml/ppx_expect/files/ppx_expect-0.14.0-ppxlib-0.18.0.patch
new file mode 100644
index 000000000000..f30da03701ba
--- /dev/null
+++ b/dev-ml/ppx_expect/files/ppx_expect-0.14.0-ppxlib-0.18.0.patch
@@ -0,0 +1,42 @@
+commit 7f46c2d22a87b99c70a220c1b13aaa34c6d217ff (HEAD, origin/upgrade-ppxlib-0.18.0)
+Author: Nathan Rebours <nathan.p.rebours@gmail.com>
+Date:   Mon Oct 5 17:46:34 2020 +0200
+
+    Make ppx_expect 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_expect
+    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 <nathan.p.rebours@gmail.com>
+
+diff --git a/expect_payload/ppx_expect_payload.ml b/expect_payload/ppx_expect_payload.ml
+index 23a12e1..fd2a5bb 100644
+--- a/expect_payload/ppx_expect_payload.ml
++++ b/expect_payload/ppx_expect_payload.ml
+@@ -86,7 +86,7 @@ let make ~kind payload ~(extension_id_loc : Location.t) =
+ let pattern () =
+   Ast_pattern.(
+     map
+-      (single_expr_payload (pexp_loc __ (pexp_constant (pconst_string __ __))))
+-      ~f:(fun f loc s tag -> f (Some (loc, s, tag)))
++      (single_expr_payload (pexp_loc __ (pexp_constant (pconst_string __ __ __))))
++      ~f:(fun f loc s _loc tag -> f (Some (loc, s, tag)))
+     ||| map (pstr nil) ~f:(fun f -> f None))
+ ;;
+diff --git a/ppx_expect.opam b/ppx_expect.opam
+index dcce541..59adadb 100644
+--- a/ppx_expect.opam
++++ b/ppx_expect.opam
+@@ -17,7 +17,7 @@ depends: [
+   "ppx_inline_test" {>= "v0.14" & < "v0.15"}
+   "stdio"           {>= "v0.14" & < "v0.15"}
+   "dune"            {>= "2.0.0"}
+-  "ppxlib"          {>= "0.11.0"}
++  "ppxlib"          {>= "0.18.0"}
+   "re"              {>= "1.8.0"}
+ ]
+ synopsis: "Cram like framework for OCaml"
diff --git a/dev-ml/ppx_expect/metadata.xml b/dev-ml/ppx_expect/metadata.xml
index e40e4cf098df..ec7beb371c4d 100644
--- a/dev-ml/ppx_expect/metadata.xml
+++ b/dev-ml/ppx_expect/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>gienah@gentoo.org</email>
+		<name>Mark Wright</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">janestreet/ppx_expect</remote-id>
 	</upstream>
diff --git a/dev-ml/ppx_expect/ppx_expect-0.14.0.ebuild b/dev-ml/ppx_expect/ppx_expect-0.14.0.ebuild
new file mode 100644
index 000000000000..4655a60d8ef7
--- /dev/null
+++ b/dev-ml/ppx_expect/ppx_expect-0.14.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Cram like framework for OCaml"
+HOMEPAGE="https://github.com/janestreet/ppx_expect"
+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 ~x86"
+IUSE="+ocamlopt test"
+
+DEPEND="
+	dev-ml/base:=
+	dev-ml/ppx_assert:=
+	dev-ml/ppx_compare:=
+	dev-ml/ppx_custom_printf:=
+	dev-ml/ppx_fields_conv:=
+	dev-ml/ppx_here:=
+	dev-ml/ppx_inline_test:=
+	dev-ml/ppx_sexp_conv:=
+	dev-ml/ppx_variants_conv:=
+	dev-ml/stdio:=
+	>=dev-ml/ppxlib-0.18.0:=
+		dev-ml/ocaml-compiler-libs:=
+		dev-ml/ocaml-migrate-parsetree:=
+			dev-ml/result:=
+	dev-ml/re:=
+"
+RDEPEND="${DEPEND}"
+DEPEND="${DEPEND}
+	test? (
+		dev-ml/ppx_jane
+	)"
+
+PATCHES=( "${FILESDIR}"/${P}-ppxlib-0.18.0.patch )