diff --git a/sdk_container/src/third_party/portage-stable/sys-boot/gnu-efi/Manifest b/sdk_container/src/third_party/portage-stable/sys-boot/gnu-efi/Manifest
index 3ca537454d..407f7fa033 100644
--- a/sdk_container/src/third_party/portage-stable/sys-boot/gnu-efi/Manifest
+++ b/sdk_container/src/third_party/portage-stable/sys-boot/gnu-efi/Manifest
@@ -1,4 +1,2 @@
-DIST gnu-efi-3.0.18.tar.bz2 167567 BLAKE2B e080fa4c57a281452a6473304871304d1b5c30d42ee728b4c0c084258ed2f6f2099c068ec5841cee81ecf664dd658dee3b94d68324ebaa498cb49cec4f7f7df9 SHA512 39f9fa14b880441a94a04400ff8850efdd9474929e5501dfd05af06e7747b4d0f7cb742ac811c7026cf52d00508efb73018be4d61d63a1211de0cd931cbc473d
 DIST gnu-efi-3.0.19.tar.gz 218588 BLAKE2B 78db87904e644406ce2eb1a0ef0f325e7ad0f004dd56199e319985c5d035b4755d545c1a6bcf749da08c7670132de28a3e53ba059956b841034c6b059e39042b SHA512 78a79f51bd271043edbf534427d8fbba3d8099e831a9643019899453e8363ebd4d43f6e5448cdde31d43a6bdb94ec32e73425138bfb614617b8886df90fc1665
-DIST gnu-efi-4.0.2.tar.gz 245063 BLAKE2B 4fe4a1000b2bcdb779aaa82e80f2a722a70230ac82f40e8fd4bfe67f73135e58e44a58b7cafce33702847ed00a1161fbc9565037298129f642ef1d875b04086c SHA512 a52e21daad16af6c1d9cff7f04076584251b77fe1eddc4e720d19de5d0a8d7cca5994b770d3236bcd9b2431918b427dd362ca7cb7e2a6e893ca4ba0e0ead9395
 DIST gnu-efi-4.0.4.tar.gz 245519 BLAKE2B a636ec81a830206b4d793689b6b4b85ab88b9061224691d47076b096e4502f4625fdc759c351d3e8b0a93fc26c33dd4862c2383d7620bb1704649c275da322f7 SHA512 4ed273ef8203f1b2fd90855821576523b070236911a26199eec220f1bad34f63759a32b06f11a681e532a2c793339d9e66bcb90e5cde5de02d8842a40c471a06
diff --git a/sdk_container/src/third_party/portage-stable/sys-boot/gnu-efi/files/gnu-efi-3.0.19-fix-binutils-2.46.patch b/sdk_container/src/third_party/portage-stable/sys-boot/gnu-efi/files/gnu-efi-3.0.19-fix-binutils-2.46.patch
new file mode 100644
index 0000000000..3499371cfa
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/sys-boot/gnu-efi/files/gnu-efi-3.0.19-fix-binutils-2.46.patch
@@ -0,0 +1,19 @@
+Backport the fix from gnu-efi 4.0.4 to build with binutils-2.46.
+
+https://bugs.gentoo.org/970040
+
+--- a/apps/Makefile
++++ b/apps/Makefile
+@@ -66,9 +66,9 @@
+ 
+ ifneq ($(HAVE_EFI_OBJCOPY),)
+ 
+-FORMAT		:= --target efi-app-$(ARCH)
+-$(TARGET_BSDRIVERS): FORMAT=--target efi-bsdrv-$(ARCH)
+-$(TARGET_RTDRIVERS): FORMAT=--target efi-rtdrv-$(ARCH)
++FORMAT		:= -O efi-app-$(ARCH)
++$(TARGET_BSDRIVERS): FORMAT=-O efi-bsdrv-$(ARCH)
++$(TARGET_RTDRIVERS): FORMAT=-O efi-rtdrv-$(ARCH)
+ 
+ else
+ 
diff --git a/sdk_container/src/third_party/portage-stable/sys-boot/gnu-efi/gnu-efi-3.0.18-r5.ebuild b/sdk_container/src/third_party/portage-stable/sys-boot/gnu-efi/gnu-efi-3.0.18-r5.ebuild
deleted file mode 100644
index d190de4fda..0000000000
--- a/sdk_container/src/third_party/portage-stable/sys-boot/gnu-efi/gnu-efi-3.0.18-r5.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 2004-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="Library for build EFI Applications"
-HOMEPAGE="https://sourceforge.net/projects/gnu-efi/"
-SRC_URI="https://downloads.sourceforge.net/gnu-efi/${P}.tar.bz2"
-
-# inc/, lib/ dirs (README.efilib)
-# - BSD-2
-# gnuefi dir:
-# - BSD (3-cluase): crt0-efi-ia32.S
-# - GPL-2+ : setjmp_ia32.S
-LICENSE="GPL-2+ BSD BSD-2"
-SLOT="0"
-KEYWORDS="-* amd64 arm arm64 ~loong ~riscv x86"
-IUSE="abi_x86_32 abi_x86_64 custom-cflags"
-REQUIRED_USE="
-	amd64? ( || ( abi_x86_32 abi_x86_64 ) )
-	x86? ( || ( abi_x86_32 abi_x86_64 ) )
-"
-
-# for ld.bfd and objcopy
-BDEPEND="sys-devel/binutils"
-
-# These objects get run early boot (i.e. not inside of Linux),
-# so doing these QA checks on them doesn't make sense.
-QA_EXECSTACK="usr/*/lib*efi.a:* usr/*/crt*.o"
-RESTRICT="strip"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-clang.patch
-	"${FILESDIR}"/${PN}-3.0.18-remove-linux-headers.patch
-)
-
-check_and_set_objcopy() {
-	if [[ ${MERGE_TYPE} != "binary" ]]; then
-		# bug #931792
-		# llvm-objcopy does not support EFI target, try to use binutils objcopy or fail
-		tc-export OBJCOPY
-		OBJCOPY="${OBJCOPY/llvm-/}"
-		# Test OBJCOPY to see if it supports EFI targets, and return if it does
-		LC_ALL=C "${OBJCOPY}" --help | grep -q '\<pei-' && return 0
-		# If OBJCOPY does not support EFI targets, it is possible that the 'objcopy' on our path is
-		# still LLVM if the 'binutils-plugin' USE flag is set. In this case, we check to see if the
-		# '(prefix)/usr/bin/objcopy' binary is available (it should be, it's a dependency), and if
-		# so, we use the absolute path explicitly.
-		local binutils_objcopy="${EPREFIX}"/usr/bin/"${OBJCOPY}"
-		if [[ -e "${binutils_objcopy}" ]]; then
-			OBJCOPY="${binutils_objcopy}"
-		fi
-		if ! use arm && ! use riscv; then
-			# bug #939338
-			# objcopy does not understand PE/COFF on these arches: arm32, riscv64 and mips64le
-			# gnu-efi containes a workaround
-			LC_ALL=C "${OBJCOPY}" --help | grep -q '\<pei-' || die "${OBJCOPY} (objcopy) does not support EFI target"
-		fi
-	fi
-}
-
-check_compiler() {
-	if [[ ${MERGE_TYPE} != "binary" ]]; then
-		tc-is-gcc || tc-is-clang || die "Unsupported compiler"
-	fi
-}
-
-pkg_pretend() {
-	check_compiler
-}
-
-pkg_setup() {
-	check_compiler
-	check_and_set_objcopy
-}
-
-src_prepare() {
-	default
-	sed -i -e "s/-Werror//" Make.defaults || die
-}
-
-efimake() {
-	local arch=
-	case ${CHOST} in
-		arm*) arch=arm ;;
-		aarch64*) arch=aarch64 ;;
-		ia64*) arch=ia64 ;;
-		i?86*) arch=ia32 ;;
-		loongarch64*) arch=loongarch64 ;;
-		riscv64*) arch=riscv64;;
-		x86_64*) arch=x86_64 ;;
-		*) die "Unknown CHOST" ;;
-	esac
-
-	local args=(
-		ARCH="${arch}"
-		HOSTCC="${BUILD_CC}"
-		CC="${CC}"
-		AS="${AS}"
-		LD="${LD}"
-		AR="${AR}"
-		OBJCOPY="${OBJCOPY}"
-		PREFIX="${EPREFIX}/usr"
-		LIBDIR='$(PREFIX)'/$(get_libdir)
-	)
-	emake -j1 "${args[@]}" "$@"
-}
-
-src_compile() {
-	tc-export BUILD_CC AR AS CC LD OBJCOPY
-
-	if ! use custom-cflags; then
-		unset CFLAGS CPPFLAGS LDFLAGS
-	fi
-
-	# work around musl: include first the compiler include dir, then the system one
-	# bug #933080, #938012
-	local CPPINCLUDEDIR
-	if tc-is-gcc; then
-		CPPINCLUDEDIR=$(LC_ALL=C ${CC} -print-search-dirs 2> /dev/null | grep ^install: | cut -f2 -d' ')/include
-	elif tc-is-clang; then
-		CPPINCLUDEDIR=$(LC_ALL=C ${CC} -print-resource-dir 2> /dev/null)/include
-	fi
-	append-cflags "-nostdinc -isystem ${CPPINCLUDEDIR} -isystem ${ESYSROOT}/usr/include"
-
-	if use amd64 || use x86; then
-		use abi_x86_32 && CHOST=i686 ABI=x86 efimake
-		use abi_x86_64 && CHOST=x86_64 ABI=amd64 efimake
-	else
-		efimake
-	fi
-}
-
-src_install() {
-	if use amd64 || use x86; then
-		use abi_x86_32 && CHOST=i686 ABI=x86 efimake INSTALLROOT="${D}" install
-		use abi_x86_64 && CHOST=x86_64 ABI=amd64 efimake INSTALLROOT="${D}" install
-	else
-		efimake INSTALLROOT="${D}" install
-	fi
-	einstalldocs
-}
diff --git a/sdk_container/src/third_party/portage-stable/sys-boot/gnu-efi/gnu-efi-3.0.19.ebuild b/sdk_container/src/third_party/portage-stable/sys-boot/gnu-efi/gnu-efi-3.0.19.ebuild
index 8a02c4f63f..61a919b1b4 100644
--- a/sdk_container/src/third_party/portage-stable/sys-boot/gnu-efi/gnu-efi-3.0.19.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-boot/gnu-efi/gnu-efi-3.0.19.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2004-2025 Gentoo Authors
+# Copyright 2004-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -34,6 +34,7 @@ RESTRICT="strip"
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.0.18-clang.patch
 	"${FILESDIR}"/${PN}-3.0.18-remove-linux-headers.patch
+	"${FILESDIR}"/${PN}-3.0.19-fix-binutils-2.46.patch
 )
 
 check_and_set_objcopy() {
diff --git a/sdk_container/src/third_party/portage-stable/sys-boot/gnu-efi/gnu-efi-4.0.2.ebuild b/sdk_container/src/third_party/portage-stable/sys-boot/gnu-efi/gnu-efi-4.0.2.ebuild
deleted file mode 100644
index f08189e0c8..0000000000
--- a/sdk_container/src/third_party/portage-stable/sys-boot/gnu-efi/gnu-efi-4.0.2.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# Copyright 2004-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="Library for build EFI Applications"
-HOMEPAGE="https://sourceforge.net/projects/gnu-efi/"
-SRC_URI="https://github.com/ncroxon/gnu-efi/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-# inc/, lib/ dirs (README.efilib)
-# - BSD-2
-# gnuefi dir:
-# - BSD (3-cluase): crt0-efi-ia32.S
-# - GPL-2+ : setjmp_ia32.S
-LICENSE="GPL-2+ BSD BSD-2"
-SLOT="0"
-KEYWORDS="-* amd64 arm arm64 ~loong ~riscv x86"
-IUSE="abi_x86_32 abi_x86_64 custom-cflags"
-REQUIRED_USE="
-	amd64? ( || ( abi_x86_32 abi_x86_64 ) )
-	x86? ( || ( abi_x86_32 abi_x86_64 ) )
-"
-
-# for ld.bfd and objcopy
-BDEPEND="sys-devel/binutils"
-
-# These objects get run early boot (i.e. not inside of Linux),
-# so doing these QA checks on them doesn't make sense.
-QA_EXECSTACK="usr/*/lib*efi.a:* usr/*/crt*.o"
-RESTRICT="strip"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.0.2-remove-linux-headers.patch
-)
-
-DOCS="README* SECURITY* docs/*"
-
-check_and_set_objcopy() {
-	if [[ ${MERGE_TYPE} != "binary" ]]; then
-
-		if use arm || use riscv; then
-			# bug #939338
-			# objcopy does not understand PE/COFF on these arches: arm32, riscv64 and mips64le
-			# gnu-efi containes a workaround
-			return 0
-		fi
-
-		# bug #931792
-		# llvm-objcopy does not support EFI target, try to use binutils objcopy or fail
-		tc-export OBJCOPY
-		# Test OBJCOPY to see if it supports EFI targets, and return if it does
-		LC_ALL=C "${OBJCOPY}" --help | grep -q '\<pei-' && return 0
-
-		# If OBJCOPY does not support EFI targets, it is possible that the 'objcopy' on our path is
-		# still LLVM if the 'binutils-plugin' USE flag is set. In this case, we check to see if the
-		# '(prefix)/usr/bin/objcopy' binary is available (it should be, it's a dependency), and if
-		# so, we use the absolute path explicitly.
-		local binutils_objcopy="${EPREFIX}"/usr/bin/objcopy
-		if [[ -e "${binutils_objcopy}" ]]; then
-			OBJCOPY="${binutils_objcopy}"
-			einfo "Forcing OBJCOPY=${OBJCOPY}"
-		fi
-
-		# Test OBJCOPY again to see if it supports EFI targets, and fail if it doesn't
-		LC_ALL=C "${OBJCOPY}" --help | grep -q '\<pei-' || die "${OBJCOPY} (objcopy) does not support EFI target"
-	fi
-}
-
-check_compiler() {
-	if [[ ${MERGE_TYPE} != "binary" ]]; then
-		tc-is-gcc || tc-is-clang || die "Unsupported compiler"
-	fi
-}
-
-pkg_pretend() {
-	check_compiler
-}
-
-pkg_setup() {
-	check_compiler
-	check_and_set_objcopy
-}
-
-src_prepare() {
-	default
-	sed -i -e "s/-Werror//" Make.defaults || die
-}
-
-efimake() {
-	local arch=
-	case ${CHOST} in
-		arm*) arch=arm ;;
-		aarch64*) arch=aarch64 ;;
-		ia64*) arch=ia64 ;;
-		i?86*) arch=ia32 ;;
-		loongarch64*) arch=loongarch64 ;;
-		riscv64*) arch=riscv64;;
-		x86_64*) arch=x86_64 ;;
-		*) die "Unknown CHOST" ;;
-	esac
-
-	local args=(
-		ARCH="${arch}"
-		HOSTCC="${BUILD_CC}"
-		CC="${CC}"
-		AS="${AS}"
-		LD="${LD}"
-		AR="${AR}"
-		OBJCOPY="${OBJCOPY}"
-		PREFIX="${EPREFIX}/usr"
-		LIBDIR='$(PREFIX)'/$(get_libdir)
-	)
-	emake -j1 "${args[@]}" "$@"
-}
-
-src_compile() {
-	tc-export BUILD_CC AR AS CC LD OBJCOPY
-
-	if ! use custom-cflags; then
-		unset CFLAGS CPPFLAGS LDFLAGS
-	fi
-
-	# work around musl: include first the compiler include dir, then the system one
-	# bug #933080, #938012
-	local CPPINCLUDEDIR
-	if tc-is-gcc; then
-		CPPINCLUDEDIR=$(LC_ALL=C ${CC} -print-search-dirs 2> /dev/null | grep ^install: | cut -f2 -d' ')/include
-	elif tc-is-clang; then
-		CPPINCLUDEDIR=$(LC_ALL=C ${CC} -print-resource-dir 2> /dev/null)/include
-	fi
-	append-cflags "-nostdinc -isystem ${CPPINCLUDEDIR} -isystem ${ESYSROOT}/usr/include"
-
-	if use amd64 || use x86; then
-		use abi_x86_32 && CHOST=i686 ABI=x86 efimake
-		use abi_x86_64 && CHOST=x86_64 ABI=amd64 efimake
-	else
-		efimake
-	fi
-}
-
-src_install() {
-	if use amd64 || use x86; then
-		use abi_x86_32 && CHOST=i686 ABI=x86 efimake INSTALLROOT="${D}" install
-		use abi_x86_64 && CHOST=x86_64 ABI=amd64 efimake INSTALLROOT="${D}" install
-	else
-		efimake INSTALLROOT="${D}" install
-	fi
-	einstalldocs
-}
diff --git a/sdk_container/src/third_party/portage-stable/sys-boot/gnu-efi/gnu-efi-4.0.4.ebuild b/sdk_container/src/third_party/portage-stable/sys-boot/gnu-efi/gnu-efi-4.0.4.ebuild
index c365147f3c..208715ffce 100644
--- a/sdk_container/src/third_party/portage-stable/sys-boot/gnu-efi/gnu-efi-4.0.4.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-boot/gnu-efi/gnu-efi-4.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2004-2025 Gentoo Authors
+# Copyright 2004-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/ncroxon/gnu-efi/archive/${PV}.tar.gz -> ${P}.tar.gz"
 # - GPL-2+ : setjmp_ia32.S
 LICENSE="GPL-2+ BSD BSD-2"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
+KEYWORDS="-* amd64 arm arm64 ~loong ~riscv x86"
 IUSE="abi_x86_32 abi_x86_64 custom-cflags"
 REQUIRED_USE="
 	amd64? ( || ( abi_x86_32 abi_x86_64 ) )