dev-ml/ppx_type_conv: use more recent upstream patch for ocaml 4.03

Package-Manager: portage-2.2.28
Signed-off-by: Alexis Ballier <aballier@gentoo.org>

diff --git a/dev-ml/ppx_type_conv/files/oc43.patch b/dev-ml/ppx_type_conv/files/oc43.patch
index ac3a1dfac57ec3fec486b137dd1c067333777c73..f9df3e1070a88c76a1381cbc399841b5e7190e99 100644 (file)
--- a/dev-ml/ppx_type_conv/files/oc43.patch
+++ b/dev-ml/ppx_type_conv/files/oc43.patch
@@ -1,6 +1,18 @@
-diff -uNr ppx_type_conv-113.33.00/_oasis ppx_type_conv-113.33.00+4.03/_oasis
+diff -uNr ppx_type_conv-113.33.00/js-utils/gen_install.ml ppx_type_conv-113.33.01+4.03/js-utils/gen_install.ml
+--- ppx_type_conv-113.33.00/js-utils/gen_install.ml    2016-03-09 16:44:55.000000000 +0100
++++ ppx_type_conv-113.33.01+4.03/js-utils/gen_install.ml       2016-04-18 12:11:00.000000000 +0200
+@@ -31,7 +31,7 @@
+   |> List.map (fun line -> Scanf.sscanf line "%[^=]=%S" (fun k v -> (k, v)))
+ 
+ let remove_cwd =
+-  let prefix = Sys.getcwd () ^ "/" in
++  let prefix = Sys.getcwd () ^ Filename.dir_sep in
+   let len_prefix = String.length prefix in
+   fun fn ->
+     let len = String.length fn in
+diff -uNr ppx_type_conv-113.33.00/_oasis ppx_type_conv-113.33.01+4.03/_oasis
 --- ppx_type_conv-113.33.00/_oasis     2016-03-09 16:44:55.000000000 +0100
-+++ ppx_type_conv-113.33.00+4.03/_oasis        2016-03-22 15:13:51.000000000 +0100
++++ ppx_type_conv-113.33.01+4.03/_oasis        2016-04-18 12:11:00.000000000 +0200
 @@ -1,8 +1,8 @@
  OASISFormat:      0.4
 -OCamlVersion:     >= 4.02.3
@@ -8,22 +20,39 @@ diff -uNr ppx_type_conv-113.33.00/_oasis ppx_type_conv-113.33.00+4.03/_oasis
  FindlibVersion:   >= 1.3.2
  Name:             ppx_type_conv
 -Version:          113.33.00
-+Version:          113.33.00+4.03
++Version:          113.33.01+4.03
  Synopsis:         Support Library for type-driven code generators
  Authors:          Jane Street Group, LLC <opensource@janestreet.com>
  Copyrights:       (C) 2015-2016 Jane Street Group LLC <opensource@janestreet.com>
-diff -uNr ppx_type_conv-113.33.00/opam ppx_type_conv-113.33.00+4.03/opam
+diff -uNr ppx_type_conv-113.33.00/opam ppx_type_conv-113.33.01+4.03/opam
 --- ppx_type_conv-113.33.00/opam       2016-03-18 12:08:01.000000000 +0100
-+++ ppx_type_conv-113.33.00+4.03/opam  2016-03-22 17:51:38.000000000 +0100
++++ ppx_type_conv-113.33.01+4.03/opam  2016-04-18 12:27:13.000000000 +0200
 @@ -17,4 +17,4 @@
    "ppx_driver"
    "ppx_tools"    {>= "0.99.3"}
  ]
 -available: [ ocaml-version >= "4.02.3" ]
 +available: [ ocaml-version >= "4.03.0" ]
-diff -uNr ppx_type_conv-113.33.00/src/type_conv.ml ppx_type_conv-113.33.00+4.03/src/type_conv.ml
+diff -uNr ppx_type_conv-113.33.00/src/ignore_unused_warning.ml ppx_type_conv-113.33.01+4.03/src/ignore_unused_warning.ml
+--- ppx_type_conv-113.33.00/src/ignore_unused_warning.ml       2016-03-09 16:44:55.000000000 +0100
++++ ppx_type_conv-113.33.01+4.03/src/ignore_unused_warning.ml  2016-04-18 12:11:00.000000000 +0200
+@@ -30,11 +30,11 @@
+           List.fold_left vbs ~init:[] ~f:(fun acc vb -> vars_of#pattern vb.pvb_pat acc)
+         in
+         let ign =
+-          pstr_value ~loc Nonrecursive
++          pstr_value_list ~loc Nonrecursive
+             (List.rev_map vars ~f:(fun v ->
+                underscore_binding (pexp_ident ~loc:v.loc v)))
+         in
+-        loop rest (ign :: item :: acc)
++        loop rest (ign @ (item :: acc))
+       | item :: rest ->
+         loop rest (item :: acc)
+     in
+diff -uNr ppx_type_conv-113.33.00/src/type_conv.ml ppx_type_conv-113.33.01+4.03/src/type_conv.ml
 --- ppx_type_conv-113.33.00/src/type_conv.ml   2016-03-09 16:44:55.000000000 +0100
-+++ ppx_type_conv-113.33.00+4.03/src/type_conv.ml      2016-03-22 15:13:51.000000000 +0100
++++ ppx_type_conv-113.33.01+4.03/src/type_conv.ml      2016-04-18 12:11:00.000000000 +0200
 @@ -472,9 +472,10 @@
      Ast_pattern.(
        let label =