commit: cca6ecd44446ed3c0bb8258eee614dbbc89989f3 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Fri Mar 28 18:28:49 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Mar 28 19:47:54 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cca6ecd4
dev-vcs/git: sync live Bug: https://bugs.gentoo.org/952004 Signed-off-by: Sam James <sam <AT> gentoo.org> dev-vcs/git/git-9999-r1.ebuild | 4 +++- dev-vcs/git/git-9999-r2.ebuild | 4 +++- dev-vcs/git/git-9999-r3.ebuild | 4 +++- dev-vcs/git/git-9999.ebuild | 4 +++- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dev-vcs/git/git-9999-r1.ebuild b/dev-vcs/git/git-9999-r1.ebuild index 6c2d648b8535..9b5ab9c40826 100644 --- a/dev-vcs/git/git-9999-r1.ebuild +++ b/dev-vcs/git/git-9999-r1.ebuild @@ -256,7 +256,9 @@ src_configure() { # otherwise. # # Fixes https://bugs.gentoo.org/952004 - sed -i "s/subdir('coccinelle')/# subdir('coccinelle')/" "${WORKDIR}/git-${PV}/contrib/meson.build" || die + emesonargs+=( + -Dcoccinelle=disabled + ) fi meson_src_configure diff --git a/dev-vcs/git/git-9999-r2.ebuild b/dev-vcs/git/git-9999-r2.ebuild index 6c2d648b8535..9b5ab9c40826 100644 --- a/dev-vcs/git/git-9999-r2.ebuild +++ b/dev-vcs/git/git-9999-r2.ebuild @@ -256,7 +256,9 @@ src_configure() { # otherwise. # # Fixes https://bugs.gentoo.org/952004 - sed -i "s/subdir('coccinelle')/# subdir('coccinelle')/" "${WORKDIR}/git-${PV}/contrib/meson.build" || die + emesonargs+=( + -Dcoccinelle=disabled + ) fi meson_src_configure diff --git a/dev-vcs/git/git-9999-r3.ebuild b/dev-vcs/git/git-9999-r3.ebuild index 6c2d648b8535..9b5ab9c40826 100644 --- a/dev-vcs/git/git-9999-r3.ebuild +++ b/dev-vcs/git/git-9999-r3.ebuild @@ -256,7 +256,9 @@ src_configure() { # otherwise. # # Fixes https://bugs.gentoo.org/952004 - sed -i "s/subdir('coccinelle')/# subdir('coccinelle')/" "${WORKDIR}/git-${PV}/contrib/meson.build" || die + emesonargs+=( + -Dcoccinelle=disabled + ) fi meson_src_configure diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild index 6c2d648b8535..9b5ab9c40826 100644 --- a/dev-vcs/git/git-9999.ebuild +++ b/dev-vcs/git/git-9999.ebuild @@ -256,7 +256,9 @@ src_configure() { # otherwise. # # Fixes https://bugs.gentoo.org/952004 - sed -i "s/subdir('coccinelle')/# subdir('coccinelle')/" "${WORKDIR}/git-${PV}/contrib/meson.build" || die + emesonargs+=( + -Dcoccinelle=disabled + ) fi meson_src_configure
