commit: 25afb42e89f3ae8a807c33add0fa889495fc551c Author: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com> AuthorDate: Sat Apr 16 12:55:27 2022 +0000 Commit: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com> CommitDate: Sat Apr 16 16:20:06 2022 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=25afb42e
dev-ml/diet: ounit2 patch Closes: https://bugs.gentoo.org/838817 Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com> dev-ml/diet/diet-0.4.ebuild | 3 ++- dev-ml/diet/files/diet-0.4-ounit2.patch | 45 +++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 1 deletion(-) diff --git a/dev-ml/diet/diet-0.4.ebuild b/dev-ml/diet/diet-0.4.ebuild index 354cfd897..c1cc5d092 100644 --- a/dev-ml/diet/diet-0.4.ebuild +++ b/dev-ml/diet/diet-0.4.ebuild @@ -23,7 +23,8 @@ IUSE="ocamlopt test" RDEPEND="dev-ml/stdlib-shims:=" DEPEND=" ${RDEPEND} - test? ( dev-ml/ounit ) + test? ( dev-ml/ounit2 ) " +PATCHES="${FILESDIR}/${P}-ounit2.patch" RESTRICT="!test? ( test )" diff --git a/dev-ml/diet/files/diet-0.4-ounit2.patch b/dev-ml/diet/files/diet-0.4-ounit2.patch new file mode 100644 index 000000000..e65b7e6d8 --- /dev/null +++ b/dev-ml/diet/files/diet-0.4-ounit2.patch @@ -0,0 +1,45 @@ +From 5557ef1e0779a94454cbe4324de7581dca4a997f Mon Sep 17 00:00:00 2001 +From: Alessandro Barbieri <[email protected]> +Date: Sat, 16 Apr 2022 14:45:55 +0200 +Subject: [PATCH 1/3] depend on ounit2 + +--- a/diet.opam ++++ b/diet.opam +@@ -9,7 +9,7 @@ depends: [ + "ocaml" {>= "4.03.0"} + "dune" + "stdlib-shims" +- "ounit" {with-test} ++ "ounit2" {with-test} + ] + build: [ + ["dune" "subst"] {pinned} + +From 64428455c8b1d3e81ce006476cbd6fe10d200176 Mon Sep 17 00:00:00 2001 +From: Alessandro Barbieri <[email protected]> +Date: Sat, 16 Apr 2022 14:47:13 +0200 +Subject: [PATCH 2/3] use ounit2 + +--- a/lib_test/dune ++++ b/lib_test/dune +@@ -1,3 +1,3 @@ + (tests + (names test) +- (libraries diet oUnit)) ++ (libraries diet ounit2)) + +From 41c6f7adf7a321cf334a99a72ffe0bf3be1eb4ba Mon Sep 17 00:00:00 2001 +From: Alessandro Barbieri <[email protected]> +Date: Sat, 16 Apr 2022 14:47:35 +0200 +Subject: [PATCH 3/3] use ounit2 + +--- a/.merlin ++++ b/.merlin +@@ -1,6 +1,6 @@ + PKG astring cmdliner cstruct logs lwt mirage-block mirage-block-unix ppx_sexp_conv ppx_tools ppx_type_conv + PKG io-page io-page.unix logs.fmt result sexplib +-PKG ezjsonm mirage-block-ramdisk nbd ounit ++PKG ezjsonm mirage-block-ramdisk nbd ounit2 + S lib + S lib_test + B _build/**
