sys-firmware/ipxe: rename USE=efi to USE=uefi

Signed-off-by: David Seifert <soap@gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/31881
Signed-off-by: Andrew Ammerlaan <andrewammerlaan@gentoo.org>

3 files changed, 14 insertions, 14 deletions

diff --git a/sys-firmware/ipxe/ipxe-1.21.1.ebuild b/sys-firmware/ipxe/ipxe-1.21.1.ebuild
index 5136e9ec3d3f..58c13763d2f1 100644
--- a/sys-firmware/ipxe/ipxe-1.21.1.ebuild
+++ b/sys-firmware/ipxe/ipxe-1.21.1.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${P}/src"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv x86"
-IUSE="+binary efi ipv6 iso lkrn +qemu undi usb vmware"
+IUSE="+binary uefi ipv6 iso lkrn +qemu undi usb vmware"
 REQUIRED_USE="!amd64? ( !x86? ( binary ) )"
 
 SOURCE_DEPEND="
@@ -93,7 +93,7 @@ src_compile() {
 		ipxemake bin/15ad07b0.rom # vmxnet3
 	fi
 
-	use efi && ipxemake PLATFORM=efi BIN=bin-efi bin-efi/ipxe.efi
+	use uefi && ipxemake PLATFORM=efi BIN=bin-efi bin-efi/ipxe.efi
 	use iso && ipxemake bin/ipxe.iso
 	use undi && ipxemake bin/undionly.kpxe
 	use usb && ipxemake bin/ipxe.usb
@@ -107,7 +107,7 @@ src_install() {
 		doins bin/*.rom
 	fi
 	use vmware && doins bin/*.mrom
-	use efi && doins bin-efi/*.efi
+	use uefi && doins bin-efi/*.efi
 	use iso && doins bin/*.iso
 	use undi && doins bin/*.kpxe
 	use usb && doins bin/*.usb
diff --git a/sys-firmware/ipxe/ipxe-1.21.1_p20230601.ebuild b/sys-firmware/ipxe/ipxe-1.21.1_p20230601.ebuild
index 8f24b1ebc727..3ab9d677fbbb 100644
--- a/sys-firmware/ipxe/ipxe-1.21.1_p20230601.ebuild
+++ b/sys-firmware/ipxe/ipxe-1.21.1_p20230601.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${PN}-${COMMIT_SHA1}/src"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv x86"
-IUSE="+binary efi efi64 ipv6 iso lkrn +qemu undi usb vmware"
+IUSE="+binary uefi32 uefi64 ipv6 iso lkrn +qemu undi usb vmware"
 REQUIRED_USE="!amd64? ( !x86? ( binary ) )"
 
 SOURCE_DEPEND="
@@ -35,7 +35,7 @@ BDEPEND="
 	)"
 
 pkg_setup() {
-	if use efi || use efi64; then
+	if use uefi32 || use uefi64; then
 		secureboot_pkg_setup
 	fi
 }
@@ -102,8 +102,8 @@ src_compile() {
 		ipxemake bin/15ad07b0.rom # vmxnet3
 	fi
 
-	use efi && ipxemake PLATFORM=efi BIN=bin-i386-efi bin-i386-efi/ipxe.efi
-	use efi64 && ipxemake PLATFORM=efi BIN=bin-x86_64-efi bin-x86_64-efi/ipxe.efi
+	use uefi32 && ipxemake PLATFORM=efi BIN=bin-i386-efi bin-i386-efi/ipxe.efi
+	use uefi64 && ipxemake PLATFORM=efi BIN=bin-x86_64-efi bin-x86_64-efi/ipxe.efi
 	use iso && ipxemake bin/ipxe.iso
 	use undi && ipxemake bin/undionly.kpxe
 	use usb && ipxemake bin/ipxe.usb
@@ -117,19 +117,19 @@ src_install() {
 		doins bin/*.rom
 	fi
 	use vmware && doins bin/*.mrom
-	use efi && newins bin-i386-efi/ipxe.efi ipxe-i386.efi
-	use efi64 && newins bin-x86_64-efi/ipxe.efi ipxe-x86_64.efi
+	use uefi32 && newins bin-i386-efi/ipxe.efi ipxe-i386.efi
+	use uefi64 && newins bin-x86_64-efi/ipxe.efi ipxe-x86_64.efi
 	# Add a symlink for backwards compatiblity, in case both variants are
 	# enabled the x86_64 bit variant takes presedence.
-	use efi && dosym ipxe-i386.efi /usr/share/ipxe/ipxe.efi
-	use efi64 && dosym ipxe-x86_64.efi /usr/share/ipxe/ipxe.efi
+	use uefi32 && dosym ipxe-i386.efi /usr/share/ipxe/ipxe.efi
+	use uefi64 && dosym ipxe-x86_64.efi /usr/share/ipxe/ipxe.efi
 
 	use iso && doins bin/*.iso
 	use undi && doins bin/*.kpxe
 	use usb && doins bin/*.usb
 	use lkrn && doins bin/*.lkrn
 
-	if use efi || use efi64; then
+	if use uefi32 || use uefi64; then
 		secureboot_auto_sign --in-place
 	fi
 
diff --git a/sys-firmware/ipxe/metadata.xml b/sys-firmware/ipxe/metadata.xml
index 11d78499e871..116526e14dbe 100644
--- a/sys-firmware/ipxe/metadata.xml
+++ b/sys-firmware/ipxe/metadata.xml
@@ -11,8 +11,8 @@
 	</maintainer>
 	<use>
 		<flag name="binary">Use pre-built binaries</flag>
-		<flag name="efi">Build a 32bit EFI program for using PXE</flag>
-		<flag name="efi64">Build a 64bit EFI program for using PXE</flag>
+		<flag name="uefi32">Build a 32bit UEFI program for using PXE</flag>
+		<flag name="uefi64">Build a 64bit UEFI program for using PXE</flag>
 		<flag name="iso">Build a bootable ISO for using PXE</flag>
 		<flag name="lkrn">Build a linux kernel bootable file for using with grub/etc...</flag>
 		<flag name="usb">Build a bootable USB image for using PXE</flag>