[gentoo-commits] repo/gentoo:master commit in: sys-apps/memtest86+/

["Andrew Ammerlaan" <andrewammerlaan@gentoo.org>]

commit:     4cab02b9d854308b1471f74c083bd1db253a4ddf
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  7 17:13:02 2024 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sun Jan  7 17:19:11 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4cab02b9

sys-apps/memtest86+: rename USE=efi* to USE=uefi*

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

 sys-apps/memtest86+/memtest86+-6.20-r1.ebuild | 16 ++++++++--------
 sys-apps/memtest86+/metadata.xml              |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/sys-apps/memtest86+/memtest86+-6.20-r1.ebuild b/sys-apps/memtest86+/memtest86+-6.20-r1.ebuild
index 87d164cf9ec0..5ca6984446ce 100644
--- a/sys-apps/memtest86+/memtest86+-6.20-r1.ebuild
+++ b/sys-apps/memtest86+/memtest86+-6.20-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2023 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/memtest86plus/memtest86plus/archive/refs/tags/v${MY_
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="bios32 bios64 +boot efi32 efi64 iso32 iso64"
+IUSE="bios32 bios64 +boot uefi32 uefi64 iso32 iso64"
 
 ISODEPS="
 	dev-libs/libisoburn
@@ -29,7 +29,7 @@ BDEPEND="
 S=${WORKDIR}/memtest86plus-${MY_PV}
 
 pkg_setup() {
-	if use efi32 || use efi64; then
+	if use uefi32 || use uefi64; then
 		secureboot_pkg_setup
 	fi
 }
@@ -50,13 +50,13 @@ src_compile() {
 	export SIZE=$(tc-getPROG SIZE size)
 	pushd build32
 		use bios32 && emake memtest.bin
-		use efi32 && emake memtest.efi
+		use uefi32 && emake memtest.efi
 		use iso32 && emake iso
 	popd
 
 	pushd build64
 		use bios64 && emake memtest.bin
-		use efi64 && emake memtest.efi
+		use uefi64 && emake memtest.efi
 		use iso64 && emake iso
 	popd
 }
@@ -64,8 +64,8 @@ src_compile() {
 install_memtest_images() {
 	use bios32 && newins build32/memtest.bin memtest32.bios
 	use bios64 && newins build64/memtest.bin memtest64.bios
-	use efi32 && newins build32/memtest.efi memtest.efi32
-	use efi64 && newins build64/memtest.efi memtest.efi64
+	use uefi32 && newins build32/memtest.efi memtest.efi32
+	use uefi64 && newins build64/memtest.efi memtest.efi64
 }
 
 src_install() {
@@ -82,7 +82,7 @@ src_install() {
 	use iso32 && newins build32/memtest.iso memtest32.iso
 	use iso64 && newins build64/memtest.iso memtest64.iso
 
-	if use efi32 || use efi64; then
+	if use uefi32 || use uefi64; then
 		secureboot_auto_sign --in-place
 	fi
 }

diff --git a/sys-apps/memtest86+/metadata.xml b/sys-apps/memtest86+/metadata.xml
index 43e3311c9323..f79f06ed9067 100644
--- a/sys-apps/memtest86+/metadata.xml
+++ b/sys-apps/memtest86+/metadata.xml
@@ -9,8 +9,8 @@
 	<flag name="bios32">Compile a BIOS-bootable 32bit memtest image</flag>
 	<flag name="bios64">Compile a BIOS-bootable 64bit memtest image</flag>
 	<flag name="boot">Install to /boot in addition to /usr/share/memtest86+/</flag>
-	<flag name="efi32">Compile a EFI32-bootable 32bit memtest image</flag>
-	<flag name="efi64">Compile a UEFI-bootable 64bit memtest image</flag>
+	<flag name="uefi32">Compile a EFI32-bootable 32bit memtest image</flag>
+	<flag name="uefi64">Compile a UEFI-bootable 64bit memtest image</flag>
 	<flag name="iso32">Compile a 32bit ISO image</flag>
 	<flag name="iso64">Compile a 64bit ISO image</flag>
 </use>