From d4be3e570dcf94847b895da53442ca14364928ea Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 4 Mar 2024 07:57:52 +0000 Subject: [PATCH] dev-vcs/git: Sync with Gentoo It's from Gentoo commit bc7db307cbae2e4fc29b2cc2d18e59e86270bf47. --- .../third_party/portage-stable/dev-vcs/git/git-2.44.0.ebuild | 5 ++++- .../portage-stable/dev-vcs/git/git-9999-r3.ebuild | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.44.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.44.0.ebuild index 1ca16eafce..5a670b6ce6 100644 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.44.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.44.0.ebuild @@ -261,7 +261,10 @@ src_prepare() { if use prefix ; then # bug #757309 - eapply "${FILESDIR}"/git-2.37.2-darwin-prefix-gettext.patch + sed -i \ + -e 's:/usr/local/opt/gettext/:/do/not/look/elsewhere/:g' \ + -e 's:/opt/homebrew/:/do/not/look/elsewhere/:g' \ + config.mak.uname || die fi sed -i \ diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999-r3.ebuild b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999-r3.ebuild index a2c9d157f9..d2b1f4666e 100644 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999-r3.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999-r3.ebuild @@ -261,7 +261,10 @@ src_prepare() { if use prefix ; then # bug #757309 - eapply "${FILESDIR}"/git-2.37.2-darwin-prefix-gettext.patch + sed -i \ + -e 's:/usr/local/opt/gettext/:/do/not/look/elsewhere/:g' \ + -e 's:/opt/homebrew/:/do/not/look/elsewhere/:g' \ + config.mak.uname || die fi sed -i \