commit: 04fdfae2d6ebd2a3a3b40be041d3db9eda6a1a98 Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org> AuthorDate: Thu Feb 9 21:03:50 2023 +0000 Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org> CommitDate: Thu Feb 9 21:04:25 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04fdfae2
dev-ml/ppx_bench: fix for ppxlib-0.29.0 Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org> .../files/ppx_bench-0.15.0-ppxlib0.29.0.patch | 23 ++++++++++++++++++++++ ...ch-0.15.0.ebuild => ppx_bench-0.15.0-r1.ebuild} | 9 +++++++-- 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/dev-ml/ppx_bench/files/ppx_bench-0.15.0-ppxlib0.29.0.patch b/dev-ml/ppx_bench/files/ppx_bench-0.15.0-ppxlib0.29.0.patch new file mode 100644 index 000000000000..580af9eb4b76 --- /dev/null +++ b/dev-ml/ppx_bench/files/ppx_bench-0.15.0-ppxlib0.29.0.patch @@ -0,0 +1,23 @@ +From ce7bcca13aff40dd667e231fc0892c8753d0fc94 Mon Sep 17 00:00:00 2001 +From: Carl Eastlund <[email protected]> +Date: Thu, 19 Jan 2023 12:20:01 -0500 +Subject: [PATCH] Stop using [Ppxlib.File_path]. + +Signed-off-by: Carl Eastlund <[email protected]> +--- + src/ppx_bench.ml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/ppx_bench.ml b/src/ppx_bench.ml +index 0c027e8..b825997 100644 +--- a/src/ppx_bench.ml ++++ b/src/ppx_bench.ml +@@ -49,7 +49,7 @@ let maybe_drop loc code = + ;; + + let descr (loc : Location.t) ?(inner_loc = loc) () = +- let filename = File_path.get_default_path loc in ++ let filename = loc.loc_start.pos_fname in + let line = loc.loc_start.pos_lnum in + let start_pos = loc.loc_start.pos_cnum - loc.loc_start.pos_bol in + let end_pos = inner_loc.Location.loc_end.pos_cnum - loc.loc_start.pos_bol in diff --git a/dev-ml/ppx_bench/ppx_bench-0.15.0.ebuild b/dev-ml/ppx_bench/ppx_bench-0.15.0-r1.ebuild similarity index 73% rename from dev-ml/ppx_bench/ppx_bench-0.15.0.ebuild rename to dev-ml/ppx_bench/ppx_bench-0.15.0-r1.ebuild index a286901987c3..3f92979b1d2f 100644 --- a/dev-ml/ppx_bench/ppx_bench-0.15.0.ebuild +++ b/dev-ml/ppx_bench/ppx_bench-0.15.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -14,5 +14,10 @@ SLOT="0/$(ver_cut 1-2)" KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" IUSE="+ocamlopt" -DEPEND="dev-ml/ppx_inline_test:${SLOT}" +DEPEND=" + dev-ml/ppx_inline_test:${SLOT} + >=dev-ml/ppxlib-0.23.0:= +" RDEPEND="${DEPEND}" + +PATCHES=( "${FILESDIR}"/${P}-ppxlib0.29.0.patch )
