From 401101f9c8077911929d3f2b60a37098460a5d89 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 24 Mar 2022 23:59:54 +0000 Subject: gentoo resync : 25.03.2022 --- app-misc/ledit/Manifest | 3 ++- app-misc/ledit/files/ledit-2.04-ocaml4.09.patch | 34 +++++++++++++++++++++++++ app-misc/ledit/ledit-2.04.ebuild | 2 ++ 3 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 app-misc/ledit/files/ledit-2.04-ocaml4.09.patch (limited to 'app-misc/ledit') diff --git a/app-misc/ledit/Manifest b/app-misc/ledit/Manifest index 3d1d840dda50..f0cdb8a527b2 100644 --- a/app-misc/ledit/Manifest +++ b/app-misc/ledit/Manifest @@ -1,3 +1,4 @@ +AUX ledit-2.04-ocaml4.09.patch 1220 BLAKE2B 73c38afb2e64772e1756de664b4eb9fdfdc90759d07d52d5bd7fec7c151f0a94d884aea6e1148849cad4b5fa445ba2d3ce1c55847af540ee70f34f6990c6f439 SHA512 c1f66e86ce7eae4a48f30e2b395649b5e1c06da7583ae0399934e01a7bf69de01fc1e113929ff81e788637d3f3208f762b41813f92ab7ea4aa3806c82d3e620f DIST ledit-2.04.tgz 24430 BLAKE2B 782f39606e6151307c30a665cfb6e641647fe861718ae304171db07ac82c27ee5ca9503229a27857723de98c15ac350f60be8df2e4b4fe7dc475ef2271dcf591 SHA512 56fed04fa6306b5550dc6ab4f000553d5b01eddbdeccaafad51160ba9e2c12de5faab08cb8463cad2952501c73dff0e2e214f52a30a74da20f18af153206b807 -EBUILD ledit-2.04.ebuild 864 BLAKE2B 8473b2ed7799fd415ad93f8e18e8c93750bf8f9c77ac246134071ce9f00ed1cf8beded5af4cb7f59da7a4cda378212002f085fbf98f7a34ffb80a0f3f2e89b13 SHA512 c6f7b725576038dbaf85c7a3ff1e335665e176f4ea340d14696c0b704b010bbc89a8f440e37bbd11c99ed2ddccd1e21d69332a95a74e9ae7acb1663c0af2b411 +EBUILD ledit-2.04.ebuild 912 BLAKE2B abe20ad17b01be4928602f75caf075a44727b99bd61e159cc036437c2ffa1ebefd7836506aa9d78f12ea8e84a92f73c74979d03b72245b4d16234621c5a64fab SHA512 b7812f62bc982212723f85fa629894ca3d676e467916aca28671482dacf581b9f0d06df3030215055951600ade26783bf704b8cdf027606e2ad7ed568d2729eb MISC metadata.xml 169 BLAKE2B 25149b73446be31f3ea3dd3a6394230987e7d4c601d1605fd3827b37bd99b3301c2e0edb95d0f59a4577ed27919f43c2cc02b1edf62c4012b935a82e709e0c05 SHA512 55c53f74b001bae56ba8c54581a4168335b6b3a28dac23a2102b76795d5fd41de33b8b3e1ec03f9acc6e7a3a77e93b1a6ff3e3967c3156dcbf22b5b5a6245ef5 diff --git a/app-misc/ledit/files/ledit-2.04-ocaml4.09.patch b/app-misc/ledit/files/ledit-2.04-ocaml4.09.patch new file mode 100644 index 000000000000..2ececde9e922 --- /dev/null +++ b/app-misc/ledit/files/ledit-2.04-ocaml4.09.patch @@ -0,0 +1,34 @@ +diff --git a/ext/pa_def.ml b/ext/pa_def.ml +index 812240d..871bfe2 100644 +--- a/ext/pa_def.ml ++++ b/ext/pa_def.ml +@@ -33,7 +33,7 @@ value subst mloc env = + loop where rec loop = + fun + [ <:expr< let $opt:rf$ $list:pel$ in $e$ >> -> +- let pel = List.map (fun (p, e) -> (p, loop e)) pel in ++ let pel = List.map (fun (p, e, al) -> (p, loop e, al)) pel in + <:expr< let $opt:rf$ $list:pel$ in $loop e$ >> + | <:expr< if $e1$ then $e2$ else $e3$ >> -> + <:expr< if $loop e1$ then $loop e2$ else $loop e3$ >> +diff --git a/ext/pa_local.ml b/ext/pa_local.ml +index b65704d..3ef9cd1 100644 +--- a/ext/pa_local.ml ++++ b/ext/pa_local.ml +@@ -23,13 +23,15 @@ value expr_of_patt p = + | _ -> Stdpp.raise_with_loc loc (Stream.Error "identifier expected") ] + ; + ++value fst3 (a,b,c) = a ; ++ + EXTEND + str_item: + [ [ "local"; rf = [ "rec" -> True | -> False ]; + lb = LIST1 let_binding SEP "and"; "in"; "value"; + rf1 = [ "rec" -> True | -> False ]; + lb1 = LIST1 let_binding SEP "and" -> +- let pl = List.map fst lb1 in ++ let pl = List.map fst3 lb1 in + let el = List.map expr_of_patt pl in + <:str_item< + value ($list:pl$) = diff --git a/app-misc/ledit/ledit-2.04.ebuild b/app-misc/ledit/ledit-2.04.ebuild index 211bc15f3c27..617592ad1b50 100644 --- a/app-misc/ledit/ledit-2.04.ebuild +++ b/app-misc/ledit/ledit-2.04.ebuild @@ -22,6 +22,8 @@ RDEPEND="${DEPEND}" # https://github.com/gentoo/gentoo/pull/14865#issuecomment-605697524 QA_FLAGS_IGNORED="/usr/bin/ledit" +PATCHES=( "${FILESDIR}"/${P}-ocaml4.09.patch ) + src_compile() { emake -j1 all if use ocamlopt; then -- cgit v1.2.3