From c4d6bd8fc2cc8a5d7bd6d53cd05cff30a60d2ba1 Mon Sep 17 00:00:00 2001 From: Eli Schwartz Date: Sun, 8 Jun 2025 11:28:42 -0400 Subject: [PATCH] sys-devel/patch: fix incorrect reliance on split-usr It hardcodes a compile-time path to `ed`. This is known and handled already because ${ED} is part of portage and does not point to `ed`. But the "fix" was to do a $PATH lookup, which in turn broke binpackage hosting (and profile migration, likely). The package doesn't have USE=split-usr and we shouldn't add one just for this. Make sure the portable API filename is used. Bug: https://bugs.gentoo.org/470210 Closes: https://bugs.gentoo.org/957593 Signed-off-by: Eli Schwartz --- .../patch/{patch-2.7.6-r7.ebuild => patch-2.7.6-r8.ebuild} | 5 +++-- sys-devel/patch/{patch-2.8.ebuild => patch-2.8-r1.ebuild} | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) rename sys-devel/patch/{patch-2.7.6-r7.ebuild => patch-2.7.6-r8.ebuild} (94%) rename sys-devel/patch/{patch-2.8.ebuild => patch-2.8-r1.ebuild} (93%) diff --git a/sys-devel/patch/patch-2.7.6-r7.ebuild b/sys-devel/patch/patch-2.7.6-r8.ebuild similarity index 94% rename from sys-devel/patch/patch-2.7.6-r7.ebuild rename to sys-devel/patch/patch-2.7.6-r8.ebuild index 5086678d26635..6ecba54d4dddd 100644 --- a/sys-devel/patch/patch-2.7.6-r7.ebuild +++ b/sys-devel/patch/patch-2.7.6-r8.ebuild @@ -68,8 +68,9 @@ src_configure() { # rename to gpatch for better BSD compatibility --program-prefix=g ) - # Do not let $ED mess up the search for `ed` 470210. - ac_cv_path_ED=$(type -P ed) \ + # Do not let $ED or $PATH (split-usr) mess up the search for `ed`: + # bug 470210 / bug 957593 + ac_cv_path_ED="${EPREFIX}/bin/ed" \ econf "${myeconfargs[@]}" } diff --git a/sys-devel/patch/patch-2.8.ebuild b/sys-devel/patch/patch-2.8-r1.ebuild similarity index 93% rename from sys-devel/patch/patch-2.8.ebuild rename to sys-devel/patch/patch-2.8-r1.ebuild index 2eceb5f473555..30b3eb9f3a660 100644 --- a/sys-devel/patch/patch-2.8.ebuild +++ b/sys-devel/patch/patch-2.8-r1.ebuild @@ -58,8 +58,9 @@ src_configure() { # rename to gpatch for better BSD compatibility --program-prefix=g ) - # Do not let $ED mess up the search for `ed` 470210. - ac_cv_path_ED=$(type -P ed) \ + # Do not let $ED or $PATH (split-usr) mess up the search for `ed`: + # bug 470210 / bug 957593 + ac_cv_path_ED="${EPREFIX}/bin/ed" \ econf "${myeconfargs[@]}" }