gentoo resync : 25.11.2020

4 files changed, 87 insertions, 2 deletions

diff --git a/dev-ml/ppx_expect/Manifest b/dev-ml/ppx_expect/Manifest
index 47585819a58c..3b73c968bdb3 100644
--- a/dev-ml/ppx_expect/Manifest
+++ b/dev-ml/ppx_expect/Manifest
@@ -1,3 +1,6 @@
+AUX ppx_expect-0.14.0-ppxlib-0.18.0.patch 1641 BLAKE2B ea0857a3681c6bce3a39191904a2223d899e9cfb362c9961e897c613dfa8f5879837cc80120653db88bd509c16b474079cf9c8ddfce3e6b79b12ddb284dab1e6 SHA512 11ab0e5d9a97d1a5749ba728c197c4a56905b21b7628d6a2c3594e46960b07bf6d9eb50d25ffc7bec77ea1e966d5016d8a20c5608f09817c73e06021c11ae372
+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
+EBUILD ppx_expect-0.14.0.ebuild 875 BLAKE2B 01c4da58e36551b5e0c8d5902e8938ba49fe6c744b452cdd8cf031986cf6d0f384427b2a971e798a49b30f9a66dbc6b243b2b2a3617deda0a52100835a4a2549 SHA512 05faaa980d20732c04aef724f073b90483f616c5413255abcb765dd829a0737cd858b8f26c0d1bb12f34942ee8a2bef7c102fefb37a4a9d24aac197d7d467149
 EBUILD ppx_expect-0.9.0.ebuild 803 BLAKE2B db16cfe2c0f98e9608036e6ed55f82ce0c000e4719ad610ed2a63a00f30dbd4d726be74c15648b1d158751eba3dafcde8af0c22341e3539f6d29aaa0272c430e SHA512 75d553529f0b249139a1d81f5990c10711e0580046f089be442ea328fe9f96045677e7149018bf75aec5cc9ab0fe20e74d411fa782b9371fb7a4dcfd80f2f992
-MISC metadata.xml 253 BLAKE2B 38d7ab4cc453c4cd6c5702c795033e7eab92b609f29fb270ef4462980620d7dae1bf5f8b8bb4e7e26b44adb6660acd7212a699b92e04558da0beec35433fe05b SHA512 3b0b5d1fa1fb91f37614f0f180cdace4bd35d5dc9495e5e651a656b6be6cd3e6e9fb9c37d2f062fde154cd81f37b784cee47bddb7ca95afd665159f20f416551
+MISC metadata.xml 330 BLAKE2B e031c1f0eaf438287c35084bdb699a00355fd4a9b2212ccb8dfb68eaba636ceae95a0f4e2566af067d947a2decb54095c52aa9c9f04137cde288b26694ed8b1b SHA512 4c224163c55960a36b9f9dd73db1c66c2c4212c6e10e817931b51aad0d288600567ac0a66117aeeddf2fdbcdbc3ce563c7462128876eccbda3c670c42673b812
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..9a38ce530841
--- /dev/null
+++ b/dev-ml/ppx_expect/ppx_expect-0.14.0.ebuild
@@ -0,0 +1,37 @@
+# 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 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	>=dev-ml/base-0.14.0:=
+	>=dev-ml/ppx_here-0.14.0:=
+	>=dev-ml/ppx_inline_test-0.14.1:=
+	>=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:=
+	dev-ml/re:=
+"
+RDEPEND="${DEPEND}"
+DEPEND="${DEPEND}
+	test? (
+		dev-ml/ppx_jane
+	)"
+# https://bugs.gentoo.org/749291#c2
+RESTRICT=test
+
+PATCHES=( "${FILESDIR}"/${P}-ppxlib-0.18.0.patch )