diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2021-02-13 21:41:11 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2021-02-13 21:41:11 +0000 |
| commit | c8d60dada2ec8eb48b2d2b290cd6683ccec40e39 (patch) | |
| tree | c44943ee0563a3fa957716de909fed683117fcb9 /dev-ml/ppx_tools | |
| parent | 69051588e2f955485fe5d45d45e616bc60a2de57 (diff) | |
gentoo (valentine's day) resync : 14.02.2021
Diffstat (limited to 'dev-ml/ppx_tools')
| -rw-r--r-- | dev-ml/ppx_tools/Manifest | 1 | ||||
| -rw-r--r-- | dev-ml/ppx_tools/files/ocaml404.patch | 47 |
2 files changed, 0 insertions, 48 deletions
diff --git a/dev-ml/ppx_tools/Manifest b/dev-ml/ppx_tools/Manifest index f8c95350428d..3161f1b306bc 100644 --- a/dev-ml/ppx_tools/Manifest +++ b/dev-ml/ppx_tools/Manifest @@ -1,4 +1,3 @@ -AUX ocaml404.patch 2031 BLAKE2B 02341fa3b292d713995f95d76f1b47970b9ff34d8b177212074c0a3c027aff1d0f27a0e3e7f03b8131904a28d285f9cc4b7b795e62327ad2da7c29f1b74240da SHA512 507bda106d25a92718aae1b0e95103d481cbe18624f80a59af6b3e884594c1d18b0c15b51f014b1af39b09a5264272f92ee8d18dcca37e7595964f85241c141a DIST ppx_tools-6.2.tar.gz 46150 BLAKE2B f8af2a1eee81d5a1e73ac606ab79d285c8c226533bcf715ed22386aecfaf51260fb9a5075d270675f1b601cb174b68d8c85556f418031a7b6bda06c4376fe443 SHA512 fc3943c69901ef46843355c3482d5a1481d05ee94fb0a344ec04101059a02cbaa76fed5742cfae82730edf378f2e140d859a5cf590653f85359255d451f07dc8 EBUILD ppx_tools-6.2.ebuild 502 BLAKE2B 6a1d63c8438455ab861e9442642d4f74aae65669791c74e9ac821e532fbcff27e0073a90a4bc787dec7e5ffaa19bec2aeded22c525fc68905567ece9007d8826 SHA512 28057bdec60fd7213fc656a77d780035049188fd7b98e9d45c7cfe0e35a045a9ad2199ec0701b6f317493fa6c35d33187015f8473fb6fa839de266e3b3f52367 MISC metadata.xml 330 BLAKE2B 52495fb4974c24c4cc083ea661dc08c13f4bcee587270fd157cc92d14a2abdf0272fff8f521cb010a893e47b44ac311fa06275b7ecabeed8a212495206460cd0 SHA512 1a3847e8e4675cdbe31ca7d176ac94ddb9ee3584d2b5dfc09798071a7bc10ca92bbe0e759684025563831b5e8b2f11bc51728a8b5422780c50a756e00d3ea7c5 diff --git a/dev-ml/ppx_tools/files/ocaml404.patch b/dev-ml/ppx_tools/files/ocaml404.patch deleted file mode 100644 index 8a2ccee071e4..000000000000 --- a/dev-ml/ppx_tools/files/ocaml404.patch +++ /dev/null @@ -1,47 +0,0 @@ -Index: ppx_tools-5.0-4.03.0/ast_mapper_class.ml -=================================================================== ---- ppx_tools-5.0-4.03.0.orig/ast_mapper_class.ml -+++ ppx_tools-5.0-4.03.0/ast_mapper_class.ml -@@ -335,6 +335,7 @@ module P = struct - | Ppat_unpack s -> unpack ~loc ~attrs (map_loc sub s) - | Ppat_exception p -> exception_ ~loc ~attrs (sub # pat p) - | Ppat_extension x -> extension ~loc ~attrs (sub # extension x) -+ | Ppat_open (l, p) -> open_ ~loc ~attrs (map_loc sub l) (sub # pat p) - end - - module CE = struct -Index: ppx_tools-5.0-4.03.0/genlifter.ml -=================================================================== ---- ppx_tools-5.0-4.03.0.orig/genlifter.ml -+++ ppx_tools-5.0-4.03.0/genlifter.ml -@@ -49,8 +49,8 @@ module Main : sig end = struct - let rec gen ty = - if Hashtbl.mem printed ty then () - else let tylid = Longident.parse ty in -- let (_, td) = -- try Env.lookup_type tylid env -+ let td = -+ try Env.find_type (Env.lookup_type tylid env) env - with Not_found -> - Format.eprintf "** Cannot resolve type %s@." ty; - exit 2 -Index: ppx_tools-5.0-4.03.0/rewriter.ml -=================================================================== ---- ppx_tools-5.0-4.03.0.orig/rewriter.ml -+++ ppx_tools-5.0-4.03.0/rewriter.ml -@@ -92,13 +92,13 @@ let () = - | `Struct -> - let pstr = Parse.implementation lexer in - let pstr = Pparse.apply_rewriters (* ~restore:true *) ~tool_name:!tool_name -- Config.ast_impl_magic_number pstr in -+ Pparse.Structure pstr in - Pprintast.structure fmt pstr; - Format.pp_print_newline fmt () - | `Sig -> - let psig = Parse.interface lexer in - let psig = Pparse.apply_rewriters (* ~restore:true *) ~tool_name:!tool_name -- Config.ast_intf_magic_number psig in -+ Pparse.Signature psig in - Pprintast.signature fmt psig; - Format.pp_print_newline fmt ()) - with exn -> |