1 |
commit: 9265c44748b3899317ec5b017b95eb15f78aa540 |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Oct 2 05:33:01 2021 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Oct 2 05:33:01 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9265c447 |
7 |
|
8 |
dev-ml/ppxlib: add 0.23.0 |
9 |
|
10 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
11 |
|
12 |
.../files/ppxlib-0.23.0-fix-ocaml-4.13.patch | 23 ++++++++++++++++++++++ |
13 |
dev-ml/ppxlib/ppxlib-0.23.0.ebuild | 10 +++------- |
14 |
2 files changed, 26 insertions(+), 7 deletions(-) |
15 |
|
16 |
diff --git a/dev-ml/ppxlib/files/ppxlib-0.23.0-fix-ocaml-4.13.patch b/dev-ml/ppxlib/files/ppxlib-0.23.0-fix-ocaml-4.13.patch |
17 |
new file mode 100644 |
18 |
index 00000000000..00bf6dc0e4c |
19 |
--- /dev/null |
20 |
+++ b/dev-ml/ppxlib/files/ppxlib-0.23.0-fix-ocaml-4.13.patch |
21 |
@@ -0,0 +1,23 @@ |
22 |
+https://github.com/ocaml-ppx/ppxlib/commit/ce371cfb4c2ad712cd8e9b803bbf4ef650aa5e72 |
23 |
+ |
24 |
+From: Sonja Heinze <sonjaleaheinze@×××××.com> |
25 |
+Date: Fri, 10 Sep 2021 16:08:22 +0200 |
26 |
+Subject: [PATCH] Make our expect-test version compatible with 4.13 compiler |
27 |
+ |
28 |
+The Warnings.parse_options function was returning a unit on older compilers |
29 |
+and is returning an alert option now, but under the hood it still has the |
30 |
+same side-effects. |
31 |
+ |
32 |
+Signed-off-by: Sonja Heinze <sonjaleaheinze@×××××.com> |
33 |
+--- a/test/expect/expect_test.ml |
34 |
++++ b/test/expect/expect_test.ml |
35 |
+@@ -63,7 +63,7 @@ let main () = |
36 |
+ setup_printers ppf; |
37 |
+ Topfind.log := ignore; |
38 |
+ |
39 |
+- Warnings.parse_options false "@a-4-29-40-41-42-44-45-48-58"; |
40 |
++ let _ = Warnings.parse_options false "@a-4-29-40-41-42-44-45-48-58" in |
41 |
+ Clflags.real_paths := false; |
42 |
+ Toploop.initialize_toplevel_env (); |
43 |
+ |
44 |
+ |
45 |
|
46 |
diff --git a/dev-ml/ppxlib/ppxlib-0.23.0.ebuild b/dev-ml/ppxlib/ppxlib-0.23.0.ebuild |
47 |
index 0acf232740e..c34f8878151 100644 |
48 |
--- a/dev-ml/ppxlib/ppxlib-0.23.0.ebuild |
49 |
+++ b/dev-ml/ppxlib/ppxlib-0.23.0.ebuild |
50 |
@@ -38,10 +38,6 @@ DEPEND="${DEPEND} |
51 |
" |
52 |
BDEPEND=">=dev-ml/dune-2.8" |
53 |
|
54 |
-src_install() { |
55 |
- dune_src_install |
56 |
- |
57 |
- # Clashes with dev-libs/nss[utils], accidentally installed upstream |
58 |
- # https://github.com/ocaml-ppx/ppxlib/issues/224 |
59 |
- rm "${ED}"/usr/bin/pp || die |
60 |
-} |
61 |
+PATCHES=( |
62 |
+ "${FILESDIR}"/${P}-fix-ocaml-4.13.patch |
63 |
+) |