gentoo auto-resync : 07:01:2024 - 18:53:56

4 files changed, 19 insertions, 19 deletions

diff --git a/sys-boot/syslinux/Manifest b/sys-boot/syslinux/Manifest
index dc0a38bc4e3d..d9f2d55320fe 100644
--- a/sys-boot/syslinux/Manifest
+++ b/sys-boot/syslinux/Manifest
@@ -7,6 +7,6 @@ AUX syslinux-6.03-sysmacros.patch 950 BLAKE2B 60fb26a4bb462409074802b8cf01afe29e
 AUX syslinux-6.04-binutils-2.41.patch 2966 BLAKE2B a821b540f16da3359daab96d92a0fa45bc9d81bebc305135fedff6c79be482895731450cdb8dca1914edf8408ac5dc1f01d12f6b9d9f6da66e7b4a9b1c699ab1 SHA512 9541ec395352852caa8f07dc54128b542ebd6fda2490de370459a998679ecdd52c5717f2bea3da945bb10a171fab17d35b7a024cdccd6bc00f17b654478a8178
 DIST syslinux-6.04-pre1.tar.xz 5283272 BLAKE2B 800e5977ed13b26a1756c33d8625e850631b642e26a86e3328196ddd998596693c3a26db0ada4c0ba78a4ba692a1cc01886b6eb693d877ddafcfb325ecdeb639 SHA512 7927dd39be8e2dcf4138a6fea33def67d19d938379d694f15b48fdd2f5924c028b7a9e7bd71d0c7c6630c203e9e2a54296628e530632ad5e6f55b1ebefe8fc98
 DIST syslinux-6.04-pre3.tar.gz 10760898 BLAKE2B 708bb7f3ecbe1888471f3be0102270c056bf8c5be22013f36b56c90f13f5358ce1853722b14b962d8156cd1f045b9687166b98a1d7ad2853acbe6303fa40fae9 SHA512 0619a25347f3964e0c7c6ff629b2f59f01bd9e0afd822f46b67f26b8c84cbc55534cf7b22ff1bf83eec4986fd2d8f1646a3d750190a7c6c50251affc0b62594d
-EBUILD syslinux-6.04_pre1-r5.ebuild 1977 BLAKE2B 6824cabf3c1d46339b6d0fbe8bacdb3ad4d1a99586f206c582192166331c46bed96869f2c173b29dfc2c665ecf2c78dd65b2ffdf7e8f2becbc9cbddc98fa0c7c SHA512 62028f051ad7347622cf7aebe4e6b35c62594a38c46d39fe40f4b3fdbdc6d8133bff2789ebb3dc4cbbff659a4fbfea76fab9c2c8d04745da6012bc3b5f09db0f
-EBUILD syslinux-6.04_pre3-r1.ebuild 2229 BLAKE2B 6ba136b277ecd00cc43c9f07da1ae3e06ae2a2aca67a4446f5173db4a224a29dcfe5e56fedff5afc3a88b0c75b948a264ad814a60d58ca9d6203c5f63abca66a SHA512 a167aacf4665a0bb2e010ccc087d510929bc480a355b2bf1bfad722150b8679ced95454fe4b340fa156f478d1d98c9a02a614976122d5a8afdffa58cfcd63a8b
-MISC metadata.xml 529 BLAKE2B 8d1614f7254b20836e2bc0f650ae2e3795fd665119bc2d1427e236a417c5c82699929c0291f4b12c04ba2ac387f9d6650682d0d95802fdf333b1267367b4e75c SHA512 e80e9ba96972111b3c5cdea98fb032c50bb7f94a445785ed54d236933768ae2734d248c71ecf54f36d6b3641a7e15abdb4ef4c0b968d59d20ee9259019d32e38
+EBUILD syslinux-6.04_pre1-r5.ebuild 1984 BLAKE2B db70078894a4d78f405250d689e578205d43c57a977c38b94d8fa4cc8b160e55489f11404d14d279cd19cdbc117efcdc13a820a2e5f1ef9d9cc0213e9a549e4c SHA512 d3e5d62106adcc74882e09ed11fc7971b85b0086868afa34b2762303a9ec5a5eba1484165f631f40ec10417dbf45e33add9bb00c825ddbf7b3fa87887593c925
+EBUILD syslinux-6.04_pre3-r1.ebuild 2237 BLAKE2B b6d3e19cb7107f47397938c71168e5beba010c754078644bf8a3ee0f70c519e9acc805b9c316a94c531f91228c8dc607471f77f6cb5f999a66659f9081cc1033 SHA512 506ceee0a7dd3982da879140ac033efed85450635106ca68645a6dcd200328d527fa0a2021ca01a87b3b761e9d6aab8d3a1a870a420561417486c6506d2a9ab8
+MISC metadata.xml 531 BLAKE2B 34e572ef969d9af7e6ca3ae97625dd1b1c84f47b41b0dbd81d3cd613615cfb88d367dd9d0415f72c9a3327df73123a9f8074ac391b3478520160717fb9dd5246 SHA512 49d64e1d28d60fe6565c550c25538402ed33a608b55ffbc376e7e27f55992982bf3466443d11382dd777ebb1a35a0b4bad04d7c9bbd29f1a489553baf96911d6
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
 }