gentoo resync : 25.11.2020

4 files changed, 76 insertions, 2 deletions

diff --git a/dev-ml/ppx_custom_printf/Manifest b/dev-ml/ppx_custom_printf/Manifest
index 2a7f1ba12da5..276e45ce87a8 100644
--- a/dev-ml/ppx_custom_printf/Manifest
+++ b/dev-ml/ppx_custom_printf/Manifest
@@ -1,3 +1,6 @@
+AUX ppx_custom_printf-0.14.0-ppxlib-0.18.0.patch 1692 BLAKE2B fee56511e88124c2df3cc075b99e97834794e997c4cf87bb3e5d018cacbf3b4ffeed886f3bac054e17b4d3e4695d8499b830fd2ee18cabef7381d352a33dcb9e SHA512 48e2a0e92d14533e66b59487c90d4c8bc0022af7a7db05b8708a5d71eadab011fb6c5e63d81f1d6fafe329f41328d2d0fb540888b9f6bfa53dc72330b5800f04
+DIST ppx_custom_printf-0.14.0.tar.gz 9600 BLAKE2B 7b921188e158d59a160502b410ac780709b40fd408cf2e06a0adb70952ef3e72144deaee1c40df512cc09997ce87621e0be2a32d28e8408914fb90f3416e0532 SHA512 2f607df87aa372ef602b4aeb44a2d697ff8696001161e544398c3675280ef7af402f4b34b8cfce900791129d2a9db13ccbf4e73518f58487adc47d5188c8652c
 DIST ppx_custom_printf-0.9.0.tar.gz 11527 BLAKE2B ad1791f1bad3c8583e67ca6300e98e8a7a047f723bbaa7c80cf6224f7333e7893fce7289456c39f6959089f15cc0da20106b33689ab198b1f47f6dc0bd853c77 SHA512 7608e09aac26f4f51d124d30c25a510abb73bea606007524a5563f5bb2c0e71f1ff033edb32c48f0c69656e8c3924b57186639812b1a647ce31f7ae15dc466cb
+EBUILD ppx_custom_printf-0.14.0.ebuild 694 BLAKE2B d6afc0b0bfaf83e39edf62c71b2d4429a5cd3d676d6e72b49d82b465b193051549eebab1aa227a3730819117aab89a698edf83e8ca6b03ea3ee8c28ed1453578 SHA512 44791b2796dce9b1553707610b8e172844631f409083d1e5a41952867ce8c5691d2e68e53416ddbb276785f00e5926ced8358e709e0068b25bb374d92b5bc345
 EBUILD ppx_custom_printf-0.9.0-r1.ebuild 645 BLAKE2B 24bdab2519315f8153e2e1a9034291bef09df3d03bb4ea9b463ea80d5b7dca4db4423875cf0c91315b19ef6a31c849ae2a320d65185b6baab7840ecda6940153 SHA512 258cdc49534126c7c5c26d03c927be5132d55b1b99fb76a3c62925df6c45a542e15dbcdaf6597349005a2b7d5a58ee157384f078aedf8367572db46d9af9bd11
-MISC metadata.xml 260 BLAKE2B 7148212699c76e565a6e3fa0b354f77287f42e58da2942a48e6a731beaca5d881e362ec362b43759422f5705392442b0e5eb3d173880fd8fc27177f02b4b8873 SHA512 eeeb523bc242ff396f3ba58feb5a6c0aa59308005ac880717be1cf7f3c88e1fab26d217e9812363a34212b9886be0e6a27bae4ca361e1b8ed817b73389fca215
+MISC metadata.xml 337 BLAKE2B 0c3a2a4da646e74eba801d91e7b0347bb2d4f82f9c67c948d2df83e8bcc24de8c04c913ad8fea547cc39b3713e71da905451bcaf5a9a8a194cec7332d85db806 SHA512 c559c7204d7ab47b35dbdde65f0146c492238ea7975b1cc4ab21848b3ca6ac9118c8c4e1a5e3c6ec5e071d4c61284374ba84796491a1cee2dd21be84dd941d08
diff --git a/dev-ml/ppx_custom_printf/files/ppx_custom_printf-0.14.0-ppxlib-0.18.0.patch b/dev-ml/ppx_custom_printf/files/ppx_custom_printf-0.14.0-ppxlib-0.18.0.patch
new file mode 100644
index 000000000000..95cd58aee4cd
--- /dev/null
+++ b/dev-ml/ppx_custom_printf/files/ppx_custom_printf-0.14.0-ppxlib-0.18.0.patch
@@ -0,0 +1,41 @@
+commit 50f8f706e868f8ebac4f2f1392365f994d674463 (HEAD, origin/upgrade-ppxlib-0.18.0)
+Author: Nathan Rebours <nathan.p.rebours@gmail.com>
+Date:   Mon Oct 5 17:56:52 2020 +0200
+
+    Make ppx_custom_printf 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_custom_printf
+    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_custom_printf.opam b/ppx_custom_printf.opam
+index 80ea710..1cc3d11 100644
+--- a/ppx_custom_printf.opam
++++ b/ppx_custom_printf.opam
+@@ -15,7 +15,7 @@ depends: [
+   "base"          {>= "v0.14" & < "v0.15"}
+   "ppx_sexp_conv" {>= "v0.14" & < "v0.15"}
+   "dune"          {>= "2.0.0"}
+-  "ppxlib"        {>= "0.11.0"}
++  "ppxlib"        {>= "0.18.0"}
+ ]
+ synopsis: "Printf-style format-strings for user-defined string conversion"
+ description: "
+diff --git a/src/ppx_custom_printf.ml b/src/ppx_custom_printf.ml
+index 18ad7fd..e9ad8b3 100644
+--- a/src/ppx_custom_printf.ml
++++ b/src/ppx_custom_printf.ml
+@@ -264,7 +264,7 @@ let expand_format_string ~loc fmt_string =
+ let expand e =
+   match e.pexp_desc with
+   | Pexp_apply ({ pexp_attributes = ident_attrs; _ },
+-                [ (Nolabel, { pexp_desc = Pexp_constant (Pconst_string (str, _))
++                [ (Nolabel, { pexp_desc = Pexp_constant (Pconst_string (str, _, _))
+                             ; pexp_loc = loc; pexp_loc_stack = _
+                             ; pexp_attributes = str_attrs }) ]) ->
+     assert_no_attributes ident_attrs;
diff --git a/dev-ml/ppx_custom_printf/metadata.xml b/dev-ml/ppx_custom_printf/metadata.xml
index db6f32d8ab1d..bd8c830ce5d7 100644
--- a/dev-ml/ppx_custom_printf/metadata.xml
+++ b/dev-ml/ppx_custom_printf/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_custom_printf</remote-id>
 	</upstream>
diff --git a/dev-ml/ppx_custom_printf/ppx_custom_printf-0.14.0.ebuild b/dev-ml/ppx_custom_printf/ppx_custom_printf-0.14.0.ebuild
new file mode 100644
index 000000000000..91fc0960056c
--- /dev/null
+++ b/dev-ml/ppx_custom_printf/ppx_custom_printf-0.14.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Printf-style format-strings for user-defined string conversion"
+HOMEPAGE="https://github.com/janestreet/ppx_custom_printf"
+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_sexp_conv-0.14.1:=
+	>=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 )