[gentoo-commits] repo/gentoo:master commit in: sys-boot/syslinux/

[Andrew Ammerlaan]

commit:     9d0a5f4cfd6cecefa59977551971e07f392a293a
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 26 14:53:23 2023 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sun Jan  7 17:19:09 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d0a5f4c

sys-boot/syslinux: rename USE=efi to USE=uefi

Signed-off-by: David Seifert <soap <AT> gentoo.org>
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 sys-boot/syslinux/metadata.xml                 |  2 +-
 sys-boot/syslinux/syslinux-6.04_pre1-r5.ebuild | 14 +++++++-------
 sys-boot/syslinux/syslinux-6.04_pre3-r1.ebuild | 16 ++++++++--------
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/sys-boot/syslinux/metadata.xml b/sys-boot/syslinux/metadata.xml
index ca6327ed17a2..1ba8d83fd2b4 100644
--- a/sys-boot/syslinux/metadata.xml
+++ b/sys-boot/syslinux/metadata.xml
@@ -10,7 +10,7 @@
        </maintainer>
        <use>
                <flag name="bios">Enable BIOS support</flag>
-               <flag name="efi">Enable EFI support</flag>
+               <flag name="uefi">Enable UEFI support</flag>
        </use>
        <upstream>
                <remote-id type="cpe">cpe:/a:gentoo:syslinux</remote-id>

diff --git a/sys-boot/syslinux/syslinux-6.04_pre1-r5.ebuild 
b/sys-boot/syslinux/syslinux-6.04_pre1-r5.ebuild
index 7ba486a0a92a..cc03c3c95fd0 100644
--- a/sys-boot/syslinux/syslinux-6.04_pre1-r5.ebuild
+++ b/sys-boot/syslinux/syslinux-6.04_pre1-r5.ebuild
@@ -13,9 +13,9 @@ 
SRC_URI="https://www.kernel.org/pub/linux/utils/boot/syslinux/Testing/6.04/${MY_
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="-* amd64 x86"
-IUSE="abi_x86_32 abi_x86_64 +bios +efi"
-REQUIRED_USE="|| ( bios efi )
-       efi? ( || ( abi_x86_32 abi_x86_64 ) )"
+IUSE="abi_x86_32 abi_x86_64 +bios +uefi"
+REQUIRED_USE="|| ( bios uefi )
+       uefi? ( || ( abi_x86_32 abi_x86_64 ) )"
 
 BDEPEND="
        dev-lang/perl
@@ -39,7 +39,7 @@ QA_PRESTRIPPED="usr/share/syslinux/.*"
 QA_FLAGS_IGNORED=".*"
 
 pkg_setup() {
-       use efi && secureboot_pkg_setup
+       use uefi && secureboot_pkg_setup
 }
 
 src_prepare() {
@@ -62,7 +62,7 @@ src_compile() {
        if use bios; then
                emake bios DATE="${DATE}" HEXDATE="${HEXDATE}"
        fi
-       if use efi; then
+       if use uefi; then
                if use abi_x86_32; then
                        emake efi32 DATE="${DATE}" HEXDATE="${HEXDATE}"
                fi
@@ -74,7 +74,7 @@ src_compile() {
 
 src_install() {
        local firmware=( $(usev bios) )
-       if use efi; then
+       if use uefi; then
                use abi_x86_32 && firmware+=( efi32 )
                use abi_x86_64 && firmware+=( efi64 )
        fi
@@ -91,5 +91,5 @@ src_install() {
        einstalldocs
        dostrip -x /usr/share/syslinux
 
-       use efi && secureboot_auto_sign --in-place
+       use uefi && secureboot_auto_sign --in-place
 }

diff --git a/sys-boot/syslinux/syslinux-6.04_pre3-r1.ebuild 
b/sys-boot/syslinux/syslinux-6.04_pre3-r1.ebuild
index b483d5b273d2..36ba918ffe7b 100644
--- a/sys-boot/syslinux/syslinux-6.04_pre3-r1.ebuild
+++ b/sys-boot/syslinux/syslinux-6.04_pre3-r1.ebuild
@@ -13,9 +13,9 @@ 
SRC_URI="https://git.zytor.com/syslinux/syslinux.git/snapshot/${MY_P}.tar.gz";
 LICENSE="GPL-2"
 SLOT="0"
 #KEYWORDS="-* ~amd64 ~x86"
-IUSE="abi_x86_32 abi_x86_64 +bios +efi"
-REQUIRED_USE="|| ( bios efi )
-       efi? ( || ( abi_x86_32 abi_x86_64 ) )"
+IUSE="abi_x86_32 abi_x86_64 +bios +uefi"
+REQUIRED_USE="|| ( bios uefi )
+       uefi? ( || ( abi_x86_32 abi_x86_64 ) )"
 
 RESTRICT="test"
 
@@ -30,7 +30,7 @@ RDEPEND="
        dev-perl/Digest-SHA1
 "
 DEPEND="${RDEPEND}
-       efi? ( sys-boot/gnu-efi[abi_x86_32(-)?,abi_x86_64(-)?] )
+       uefi? ( sys-boot/gnu-efi[abi_x86_32(-)?,abi_x86_64(-)?] )
        virtual/os-headers
 "
 
@@ -42,7 +42,7 @@ QA_PRESTRIPPED="usr/share/syslinux/.*"
 QA_FLAGS_IGNORED=".*"
 
 pkg_setup() {
-       use efi && secureboot_pkg_setup
+       use uefi && secureboot_pkg_setup
 }
 
 src_prepare() {
@@ -78,7 +78,7 @@ src_compile() {
        if use bios; then
                emake bios DATE="${DATE}" HEXDATE="${HEXDATE}"
        fi
-       if use efi; then
+       if use uefi; then
                if use abi_x86_32; then
                        efimake x86 efi32 DATE="${DATE}" HEXDATE="${HEXDATE}"
                fi
@@ -90,7 +90,7 @@ src_compile() {
 
 src_install() {
        local firmware=( $(usev bios) )
-       if use efi; then
+       if use uefi; then
                use abi_x86_32 && firmware+=( efi32 )
                use abi_x86_64 && firmware+=( efi64 )
        fi
@@ -107,5 +107,5 @@ src_install() {
        einstalldocs
        dostrip -x /usr/share/syslinux
 
-       use efi && secureboot_auto_sign --in-place
+       use uefi && secureboot_auto_sign --in-place
 }