diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/patch/patch-2.7.6-r7.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/patch/patch-2.7.6-r8.ebuild
similarity index 94%
rename from sdk_container/src/third_party/portage-stable/sys-devel/patch/patch-2.7.6-r7.ebuild
rename to sdk_container/src/third_party/portage-stable/sys-devel/patch/patch-2.7.6-r8.ebuild
index 5086678d26..6ecba54d4d 100644
--- a/sdk_container/src/third_party/portage-stable/sys-devel/patch/patch-2.7.6-r7.ebuild
+++ b/sdk_container/src/third_party/portage-stable/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/sdk_container/src/third_party/portage-stable/sys-devel/patch/patch-2.8.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/patch/patch-2.8-r1.ebuild
similarity index 85%
rename from sdk_container/src/third_party/portage-stable/sys-devel/patch/patch-2.8.ebuild
rename to sdk_container/src/third_party/portage-stable/sys-devel/patch/patch-2.8-r1.ebuild
index 8f8d1b87aa..30b3eb9f3a 100644
--- a/sdk_container/src/third_party/portage-stable/sys-devel/patch/patch-2.8.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-devel/patch/patch-2.8-r1.ebuild
@@ -22,7 +22,7 @@ else
 	SRC_URI="mirror://gnu/patch/${P}.tar.xz"
 	SRC_URI+=" verify-sig? ( mirror://gnu/patch/${P}.tar.xz.sig )"
 
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="GPL-3+"
@@ -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[@]}"
 }