gentoo resync : 25.11.2020

4 files changed, 94 insertions, 2 deletions

diff --git a/dev-ml/ppx_fields_conv/Manifest b/dev-ml/ppx_fields_conv/Manifest
index a92b19534cbf..11051f33f47b 100644
--- a/dev-ml/ppx_fields_conv/Manifest
+++ b/dev-ml/ppx_fields_conv/Manifest
@@ -1,3 +1,6 @@
+AUX ppx_fields_conv-0.14.1-ppxlib-0.18.0.patch 2477 BLAKE2B fa3c0da65865573142d3f552492fbda53f0015297cb5d7899e5b3c0c9f1cfca8c040a3371620a81de6a9bcd5c6983af45567a81e1fd38122f7790eeb58c752f5 SHA512 b18dcd556c4a88035ed3f5367cdc19986960c247114fe5bdb5f78b3f4bfc1486a488b4393d6d8ff4ae78e2b924252e30f234932ca846c5803f7db1e058e702d4
+DIST ppx_fields_conv-0.14.1.tar.gz 14348 BLAKE2B 09bd2db4dab314ba50bcd5566c4ba4fd834fc34ba15be2132d5cbe3c27e5c76e37b4cccd3bc4cc4a5bd930f95215f6100557b89e44d54e906e382381be1fe257 SHA512 afd0f16b851e2984e46ac1d9347268a1cdb9a9054ea18435a5030dd512ba56f97b54639cc6cc6254498ca3fd2fa4d5c0053c7f2ceddd531ebbd9afef5b5f3e3d
 DIST ppx_fields_conv-0.9.0.tar.gz 15171 BLAKE2B 5a0051a1b362dcf15ddd4ec4f3f6f4df6d709a8c2709222a2d2502eb12b8728fb28ce9213a1789270d30505c6084ab8203dc7b49d7043d9820aabb0cc74c51c2 SHA512 1edcd7076c1dbba84b86f05624b3792404b24ae4414ee0c3b32dcfc998da77a2a9d52d063fefc24be21d98472d6f58880c37ac29c610fb5b8a401224fc654ec1
+EBUILD ppx_fields_conv-0.14.1.ebuild 672 BLAKE2B 09ab8474817fd449b00d85ffcda17e3c61b97a62a6be0b3abc0c09d465f4b486e69631b7e8a7438378e0e279bf3dda6283423cec1c35e7e3617a72881432e969 SHA512 3440c0043db39ca2c8dfa6f1ce470f8a3a4349c1b1c1e95c708988bfdf2953378a068837c2984730785f3f4bb94eff9024fd96e7b69d2a5caf39c06c645a1bb2
 EBUILD ppx_fields_conv-0.9.0-r1.ebuild 652 BLAKE2B 2ea1eed022ac76e42c56a2c364f703c9f68ca9266836c2465291bbbbe3a14b8fa8001393f7f32ad554196e201279dbb20708fb05ecd564d21fb5f10f56dee71a SHA512 efe73ceafc884d13db789224d506745d614b2351ddc6f365d2a3c9adeaa5d671659f9bcd21ec8204bb3bcedc9eaafd113c81d8d6df4da3f796abb5cd6c967714
-MISC metadata.xml 258 BLAKE2B a755351062621815bf57c7a4492cfb2d92f14a0f753c9596ae7be977ec0d045b65cf4c775d82af704659733c7fc8df81e6bc34084ed4565bfb391fef33b15778 SHA512 a962cdf6abc3e5efc9d129362dc90b35c0a317b4914925081a6cca031e4037134940e945c3bdcb5df62f16065d3b6d1e51c629876c766238a31651cbd3c796a0
+MISC metadata.xml 335 BLAKE2B e0b5f44d914f2c0f4be92d8dd9bfcc7d31c9611967e3ffb8613020da75f7743626a7a3ca3997ceef4dee553d93a877ca4a4dfc71479f1ef8519de4b7f9eccc69 SHA512 286086f10f94d23ddedabd099ecd0f9a4017e0921fb4fa7bee307a6dc6340a3c54d2d7aa630b7b2f28b496dbddc482ef56916b3d989928f1bcb6540fc8e8a530
diff --git a/dev-ml/ppx_fields_conv/files/ppx_fields_conv-0.14.1-ppxlib-0.18.0.patch b/dev-ml/ppx_fields_conv/files/ppx_fields_conv-0.14.1-ppxlib-0.18.0.patch
new file mode 100644
index 000000000000..23b5a8be82c2
--- /dev/null
+++ b/dev-ml/ppx_fields_conv/files/ppx_fields_conv-0.14.1-ppxlib-0.18.0.patch
@@ -0,0 +1,60 @@
+commit f3c6846ad9015de0adb44f519ff010ff0ed51180 (HEAD, origin/upgrade-ppxlib-0.18.0)
+Author: Nathan Rebours <nathan.p.rebours@gmail.com>
+Date:   Mon Oct 5 18:20:23 2020 +0200
+
+    Make ppx_fields_conv 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_fields_conv
+    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/ppx_fields_conv.opam b/ppx_fields_conv.opam
+index 91a9692..3e2d24a 100644
+--- a/ppx_fields_conv.opam
++++ b/ppx_fields_conv.opam
+@@ -15,7 +15,7 @@ depends: [
+   "base"      {>= "v0.14" & < "v0.15"}
+   "fieldslib" {>= "v0.14" & < "v0.15"}
+   "dune"      {>= "2.0.0"}
+-  "ppxlib"    {>= "0.14.0"}
++  "ppxlib"    {>= "0.18.0"}
+ ]
+ synopsis: "Generation of accessor and iteration functions for ocaml records"
+ description: "
+diff --git a/src/ppx_fields_conv.ml b/src/ppx_fields_conv.ml
+index 130e82b..87752cb 100644
+--- a/src/ppx_fields_conv.ml
++++ b/src/ppx_fields_conv.ml
+@@ -34,9 +34,6 @@ let check_no_collision =
+ 
+ module A = struct (* Additional AST construction helpers *)
+ 
+-  let exp_string : (loc:Location.t -> string -> expression) = fun ~loc s ->
+-    pexp_constant ~loc (Pconst_string (s,None))
+-
+   let pat_name : (loc:Location.t -> string -> pattern) = fun ~loc name ->
+     ppat_var ~loc (Loc.make name ~loc)
+ 
+@@ -440,7 +437,7 @@ module Gen_struct = struct
+           [%expr
+               Fieldslib.Field.Field { Fieldslib.Field.For_generated_code.
+                 force_variance = (fun (_ : [%t perm]) -> ());
+-                name = [%e A.exp_string ~loc name];
++                name = [%e estring ~loc name];
+                 getter = [%e A.exp_name ~loc name];
+                 setter = [%e setter_field];
+                 fset = [%e fset];}]
+@@ -725,7 +722,7 @@ module Gen_struct = struct
+     let getter_and_setters, fields = gen_fields ~private_ ~loc labdecs in
+     let create = creation_fun ~loc record_name labdecs in
+     let simple_create = simple_creation_fun ~loc record_name labdecs in
+-    let names = List.map (Inspect.field_names labdecs) ~f:(A.exp_string ~loc) in
++    let names = List.map (Inspect.field_names labdecs) ~f:(estring ~loc) in
+     let fields_module =
+       if String.equal record_name "t" then "Fields" else "Fields_of_" ^ record_name
+     in
diff --git a/dev-ml/ppx_fields_conv/metadata.xml b/dev-ml/ppx_fields_conv/metadata.xml
index 69d1f03f1b85..06458282b1c0 100644
--- a/dev-ml/ppx_fields_conv/metadata.xml
+++ b/dev-ml/ppx_fields_conv/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_fields_conv</remote-id>
 	</upstream>
diff --git a/dev-ml/ppx_fields_conv/ppx_fields_conv-0.14.1.ebuild b/dev-ml/ppx_fields_conv/ppx_fields_conv-0.14.1.ebuild
new file mode 100644
index 000000000000..2d1108cc9703
--- /dev/null
+++ b/dev-ml/ppx_fields_conv/ppx_fields_conv-0.14.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Generation of accessor and iteration functions for ocaml records"
+HOMEPAGE="https://github.com/janestreet/ppx_fields_conv"
+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/fieldslib-0.14.0:=
+	>=dev-ml/ppxlib-0.18.0:=
+		>=dev-ml/ocaml-migrate-parsetree-2.0.0:=
+			dev-ml/cinaps:=
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-ppxlib-0.18.0.patch )