[gentoo-commits] repo/gentoo:master commit in: dev-ml/ppx_assert/files/, dev-ml/ppx_assert/

[gentoo-commits] repo/gentoo:master commit in: dev-ml/ppx_assert/files/, dev-ml/ppx_assert/

[Alfredo Tupone]

commit:     520ce0cb598b20c344c4e8698f0c64fffdf8816a
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 30 17:24:49 2021 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Thu Sep 30 17:25:46 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=520ce0cb

dev-ml/ppx_assert: fix ocaml-4.12

Closes: https://bugs.gentoo.org/794895
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>

 .../ppx_assert/files/ppx_assert-0.14.0-4.12.patch  | 30 ++++++++++++++++++++++
 dev-ml/ppx_assert/metadata.xml                     |  4 +++
 dev-ml/ppx_assert/ppx_assert-0.14.0.ebuild         |  2 ++
 3 files changed, 36 insertions(+)

diff --git a/dev-ml/ppx_assert/files/ppx_assert-0.14.0-4.12.patch b/dev-ml/ppx_assert/files/ppx_assert-0.14.0-4.12.patch
new file mode 100644
index 00000000000..80ff9fb1eb4
--- /dev/null
+++ b/dev-ml/ppx_assert/files/ppx_assert-0.14.0-4.12.patch
@@ -0,0 +1,30 @@
+--- a/runtime-lib/runtime.ml	2021-09-30 19:07:51.592766183 +0200
++++ b/runtime-lib/runtime.ml	2021-09-30 19:11:18.035634157 +0200
+@@ -71,7 +71,7 @@
+   end;
+   `Fail (expect, got)
+ 
+-let test_result_or_eq ~sexpifier ~comparator ?equal ~expect ~got =
++let test_result_or_eq ~sexpifier ~comparator ~equal ~expect ~got =
+   let pass =
+     match equal with
+     | None -> comparator got expect = 0
+@@ -89,7 +89,7 @@
+   ]
+ 
+ let test_eq ~pos ~sexpifier ~comparator ~here ?message ?equal t1 t2 =
+-  match test_result_or_eq ~sexpifier ~comparator ?equal ~expect:t1 ~got:t2 with
++  match test_result_or_eq ~sexpifier ~comparator ~equal ~expect:t1 ~got:t2 with
+   | `Pass -> ()
+   | `Fail (t1, t2) -> test_eq_failed ~message ~pos ~here ~t1 ~t2
+ 
+@@ -99,7 +99,7 @@
+     Sexp.List [Sexp.Atom "got"; got];
+   ]
+ 
+-let test_result ~pos ~sexpifier ~comparator ~here ?message ?equal ~expect ~got =
+-  match test_result_or_eq ~sexpifier ~comparator ?equal ~expect ~got with
++let[@warning "-16"] test_result ~pos ~sexpifier ~comparator ~here ?message ?equal ~expect ~got =
++  match test_result_or_eq ~sexpifier ~comparator ~equal ~expect ~got with
+   | `Pass -> ()
+   | `Fail (expect, got) -> test_result_failed ~message ~pos ~here ~expect ~got

diff --git a/dev-ml/ppx_assert/metadata.xml b/dev-ml/ppx_assert/metadata.xml
index d2c8c92d51d..d0d7bf7876c 100644
--- a/dev-ml/ppx_assert/metadata.xml
+++ b/dev-ml/ppx_assert/metadata.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="project">
+		<email>ml@gentoo.org</email>
+		<name>ML</name>
+	</maintainer>
 	<maintainer type="person">
 		<email>gienah@gentoo.org</email>
 		<name>Mark Wright</name>

diff --git a/dev-ml/ppx_assert/ppx_assert-0.14.0.ebuild b/dev-ml/ppx_assert/ppx_assert-0.14.0.ebuild
index 4db2bc4b592..0be3c6c2301 100644
--- a/dev-ml/ppx_assert/ppx_assert-0.14.0.ebuild
+++ b/dev-ml/ppx_assert/ppx_assert-0.14.0.ebuild
@@ -27,3 +27,5 @@ DEPEND="
 			dev-ml/cinaps:=
 "
 RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-4.12.patch )