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

16 files changed, 51 insertions, 88 deletions

diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz
index 1d3e60293188..1af0190868e1 100644
--- a/sys-block/Manifest.gz
+++ b/sys-block/Manifest.gz
diff --git a/sys-block/partitionmanager/Manifest b/sys-block/partitionmanager/Manifest
index 8a89db41896a..8fc8f6034d1e 100644
--- a/sys-block/partitionmanager/Manifest
+++ b/sys-block/partitionmanager/Manifest
@@ -1,5 +1,3 @@
-DIST partitionmanager-23.08.3.tar.xz 2147812 BLAKE2B 595deda9d654af0c319d2e092d7c690dd2a53071ac37007dcd0199fee16d9e40b16fd64dc429bc84b334a3622b3171c36427bbfdc8e3316fbd75e696f6693ee0 SHA512 61c97abde57f197fc60751e43ac58427f5e86afc21b426582b538d92804bd8d9f6817ac9021bdff183744b8ae229e75a02966217bc8176cef3440a56ba6b00ae
 DIST partitionmanager-23.08.4.tar.xz 2147916 BLAKE2B 64820a51556ceec91f596ee94413fdbbdcdd38b76076fd1b9c18dd54ef6b51f9adaf9e841f8134f09d70be8b96b9245a9558d581acc596cbed2ad632f7d06a94 SHA512 be16629fffa21d9422868b845670db9d9103b40ace239bb10182d2ab570ae5c980af2995b3e62bf1098626ea4b1a6abf00b5547bffb17c4d857adbdcf7aa0738
-EBUILD partitionmanager-23.08.3.ebuild 1008 BLAKE2B 8460e8d86fc121b19838492085866535e6322777633872737566a83c36dfa2aaf2a86e15aa3167182570ebc79d19df9388bc9643c52b643185148ee1671fa9fe SHA512 1bb44a1745d43e66241c37530217835e6680a4d08eba1d347ec8d094ee2d74a4ee56252f0589b01d6d7a17ff4e97851c52406391ca02829210e717d296566645
 EBUILD partitionmanager-23.08.4.ebuild 1008 BLAKE2B d85417e4967840b5232a967e01b9b6ee054961ad8490c765e442a753509f9d12571675ad440dffecaa2ebf368a1009a58cc1a60b0d435fb4ec77f151bdae5fa9 SHA512 582e1223b896c255bed3c6ac4be1a3433f706a136f32da026e7c1de6f3f468538ebca43f8217c0fba348588e749c6835ca8dbd1c2f56cd081aa17f2b50fafb3a
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/sys-block/partitionmanager/partitionmanager-23.08.3.ebuild b/sys-block/partitionmanager/partitionmanager-23.08.3.ebuild
deleted file mode 100644
index 03f161e486e4..000000000000
--- a/sys-block/partitionmanager/partitionmanager-23.08.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="optional"
-KFMIN=5.106.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.9
-inherit ecm gear.kde.org
-
-DESCRIPTION="Utility for management of disks, partitions and file systems"
-HOMEPAGE="https://apps.kde.org/partitionmanager/"
-
-LICENSE="GPL-3"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=sys-auth/polkit-qt-0.113.0[qt5(+)]
-	>=sys-libs/kpmcore-${PVCUT}:5=
-"
-RDEPEND="${DEPEND}"
diff --git a/sys-block/perccli/Manifest b/sys-block/perccli/Manifest
index 42ad940ec95b..f77fa03df4a9 100644
--- a/sys-block/perccli/Manifest
+++ b/sys-block/perccli/Manifest
@@ -2,6 +2,6 @@ DIST PERCCLI_7.2313.0_A14_Linux.tar.gz 4690834 BLAKE2B 9c197a4cdb3305b7c7228506d
 DIST dell-sas-hba-12gbps_reference-guide_en-us.pdf 450398 BLAKE2B b97ef640b53fb631ac4d9478f621709d7dad1d19786b8fcd96adcaef3ae8a13ca449f0b5d63b29e36c0a10a30b187164cc2a538836f95c6c0c669f31c9443b2f SHA512 17be31c01d350ca28434ded58599f1de8ca93770fcc52da107d8639d93145397ba5b43931c86020093de9eaec092f8bb6a4c401a2d98bdc7ec465e947b462a3d
 DIST perccli-7.2313.0.efi 14427392 BLAKE2B 1407fd682982604ee2c602fd70ea577fefec729751c561534d7141204c36fddad2113e78913e840d75cde2d62905caa6761b68cb98d2d3247e0da103f7b93233 SHA512 6f1f3f5e027202720336784de4482b092b537ba0d0c34a364886fd39c7ab3393ddaf2ba5b966d73e8c3735e89abfa747d53189182547794c73b2eef3a5d15c7c
 DIST perccli_linux_NF8G9_A07_7.529.00.tar.gz 6624840 BLAKE2B 29b67d8807bc12b2c4d3df880176209ba9c44f48d74367172d1d673070ece435537158c5998fc79eb68c33ec3eb2009e55e333f88419c23f911af091e6ccf371 SHA512 71e44772d291fa2d9529ab10917a3841395fe16daa66a2d64d1e120d5c3d43ce34479a5217fc1fbe7f4772b92fccc673fe387cb2e9a7683c9b5a3e26a348713c
-EBUILD perccli-7.2313.0.ebuild 1556 BLAKE2B 793f26d12743db68bd02128d426af1303eb7a64bca811f292e828bb350b12dbf7dfe0b7809cad4899c347cc76c0149f5672cc3ec328bf89f4b3f123db5ecdf0d SHA512 8a818b5351153459cd0050a2c910747c3ebfe39a4a3fbfc1216ea38af9af0623519aa6baddecc27fcecc160f94796368cb90dbffdd21e63221e12ffd4eaf37be
-EBUILD perccli-7.5.007.0529-r2.ebuild 1399 BLAKE2B 9d33fe8df4a2b26be4d1c4d4643af35ad734675a3e7d1437ad2974de5aa4bcc77034f85d9c0339068e8970dbb00cb0018800b290f555f3de77e04aa7b3669f15 SHA512 63db586dded376df34b7cbc7e20d436cf577ef1d79bc0584a5b74e562a51b51516238889aa604144ff4da6ede799dcfac5503f011d0f06d23e102c00071d419e
-MISC metadata.xml 314 BLAKE2B 1062c6ed87972d76302d014ecad0a142f00d28fe53e795af91f5aa00005dc3b670a5fcc37e2be116ab18651accd6ef73e4e9751e02e715cfa1f00d0f34832131 SHA512 89bdb85f398818e3bc804e30c461daf7851804a41a95234c92843d260c655aeadacfe19f6f94f8bc94a72c17060e5696132354c109ea9ecca3118162fed3244e
+EBUILD perccli-7.2313.0.ebuild 1562 BLAKE2B 61f4f91d38e6e719d250735956ecb18bb633876e6e9df8c2d48f5e5a0ee95ba543255ca6f79aceaa6b574df9bf3d110e2dfef035ad8a397b653dcbcf1d5bc780 SHA512 00c6e1eb220800c3f2549eabbbd7c08b6b7996f45bad7979a7193f7799318050e97e05f19fc2de0910557dba1298b8667cff706b46ad0179c2bfdeb279cfdb14
+EBUILD perccli-7.5.007.0529-r2.ebuild 1394 BLAKE2B 8a74add8c04dca1029a9cbaa7a708083b4802d7e871dd76207d4a93c9f2aa21369e78a649c555eefe51d9d40db247df72ea2746d9c90cf83dcccf1ae0058745a SHA512 8ea59ce22da9b9fcb748413fc1b4ac4014a53a3de80f871b0f5231f0ece56056c1b15ce92a0b3472dc07395c51ac049f84dabd997e46154a937d93d251366e40
+MISC metadata.xml 316 BLAKE2B 005f5061dfbc6dfdaa492f5924941dbc8c59b0beb9dc12af726595e154f4786e229a2b0adc235eff622e8d09dc1d33ec894ce9e536ccedf59129df5b8a7643bc SHA512 8bc350aaa15c51e25e286065e95828ab84e2d49e974b4337c295ed02003bcd318e37ec4788a8c5efade9ebb1797116359c7abeea4c2a1f92c2405c3f0ad2db89
diff --git a/sys-block/perccli/metadata.xml b/sys-block/perccli/metadata.xml
index 55d75d1768a2..c4392c4ef605 100644
--- a/sys-block/perccli/metadata.xml
+++ b/sys-block/perccli/metadata.xml
@@ -6,6 +6,6 @@
 		<name>Zac Medico</name>
 	</maintainer>
 	<use>
-		<flag name="efi">Install EFI variant as well</flag>
+		<flag name="uefi">Install UEFI variant as well</flag>
 	</use>
 </pkgmetadata>
diff --git a/sys-block/perccli/perccli-7.2313.0.ebuild b/sys-block/perccli/perccli-7.2313.0.ebuild
index b60f35fc2ab6..95613760ef51 100644
--- a/sys-block/perccli/perccli-7.2313.0.ebuild
+++ b/sys-block/perccli/perccli-7.2313.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://www.dell.com/support/home/en-us/drivers/driversdetails?driveri
 LICENSE="Dell-EULA"
 SLOT="0"
 KEYWORDS="-* ~amd64"
-IUSE="efi"
+IUSE="uefi"
 RESTRICT="bindist fetch mirror strip"
 DEPEND=""
 RDEPEND=""
@@ -18,7 +18,7 @@ QA_PREBUILT="opt/MegaRAID/perccli/perccli* boot/efi/perccli.efi"
 # Files not fetchable with the default user-agent, and EULA
 # requires consent for redistribution.
 SRC_URI="https://dl.dell.com/FOLDER09770976M/1/PERCCLI_7.2313.0_A14_Linux.tar.gz
-	efi? ( https://dl.dell.com/FOLDER09770794M/1/perccli.efi -> perccli-7.2313.0.efi )"
+	uefi? ( https://dl.dell.com/FOLDER09770794M/1/perccli.efi -> perccli-7.2313.0.efi )"
 
 S=${WORKDIR}
 
@@ -26,7 +26,7 @@ pkg_nofetch() {
 	einfo "Please download PERCCLI_7.2313.0_A14_Linux.tar.gz from"
 	einfo "${HOMEPAGE}"
 	einfo "and place the file in your DISTDIR directory."
-	if use efi; then
+	if use uefi; then
 		einfo "Please download perccli.efi from"
 		einfo "${HOMEPAGE}"
 		einfo "and rename the file to perccli-7.2313.0.efi and place it in your DISTDIR directory."
@@ -34,7 +34,7 @@ pkg_nofetch() {
 }
 
 pkg_setup() {
-	use efi && secureboot_pkg_setup
+	use uefi && secureboot_pkg_setup
 }
 
 src_unpack() {
@@ -47,9 +47,9 @@ src_install() {
 	doexe opt/MegaRAID/perccli/perccli64 && \
 		dosym perccli64 /opt/MegaRAID/perccli/perccli
 	dosym ../MegaRAID/perccli/perccli /opt/bin/perccli
-	if use efi; then
+	if use uefi; then
 		exeinto /boot/efi
 		newexe "${DISTDIR}/perccli-7.2313.0.efi" perccli.efi
 	fi
-	use efi && secureboot_auto_sign --in-place
+	use uefi && secureboot_auto_sign --in-place
 }
diff --git a/sys-block/perccli/perccli-7.5.007.0529-r2.ebuild b/sys-block/perccli/perccli-7.5.007.0529-r2.ebuild
index a6a8cab93d8f..435580a4bd99 100644
--- a/sys-block/perccli/perccli-7.5.007.0529-r2.ebuild
+++ b/sys-block/perccli/perccli-7.5.007.0529-r2.ebuild
@@ -2,33 +2,33 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit mount-boot rpm secureboot
 
+DISTFILE_DOC="dell-sas-hba-12gbps_reference-guide_en-us.pdf"
+
 DESCRIPTION="LINUX PERCCLI Utility For All Dell HBA/PERC Controllers"
 HOMEPAGE="https://www.dell.com/support/home/us/en/19/drivers/driversdetails?driverId=NF8G9"
+SRC_URI="
+	https://downloads.dell.com/FOLDER05235308M/1/perccli_linux_NF8G9_A07_7.529.00.tar.gz
+	doc? ( https://topics-cdn.dell.com/pdf/${DISTFILE_DOC} )"
+S="${WORKDIR}/perccli_7.5-007.0529_linux"
+
 LICENSE="Avago BSD"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
-IUSE="doc efi"
+IUSE="doc uefi"
 RESTRICT="strip"
-DEPEND=""
-RDEPEND=""
-QA_PREBUILT="opt/MegaRAID/perccli/perccli* boot/efi/perccli.efi"
 
-DISTFILE_DOC=dell-sas-hba-12gbps_reference-guide_en-us.pdf
-
-SRC_URI="https://downloads.dell.com/FOLDER05235308M/1/perccli_linux_NF8G9_A07_7.529.00.tar.gz
-	doc? ( https://topics-cdn.dell.com/pdf/${DISTFILE_DOC} )"
-
-S="${WORKDIR}"/perccli_7.5-007.0529_linux
+QA_PREBUILT="opt/MegaRAID/perccli/perccli* boot/efi/perccli.efi"
 
 pkg_setup() {
-	use efi && secureboot_pkg_setup
+	use uefi && secureboot_pkg_setup
 }
 
 src_unpack() {
 	default
-	cd "${S}"
+	cd "${S}" || die
 	rpm_unpack ./Linux/perccli-*.rpm
 }
 
@@ -40,10 +40,10 @@ src_install() {
 	use x86 && dosym perccli32 opt/MegaRAID/perccli/perccli
 	dosym ../MegaRAID/perccli/perccli /opt/bin/perccli
 	use amd64 && dosym ../MegaRAID/perccli/perccli32 /opt/bin/perccli32
-	if use efi; then
+	if use uefi; then
 		exeinto /boot/efi/
 		doexe EFI/perccli.efi
 	fi
 	use doc && dodoc "${DISTDIR}"/${DISTFILE_DOC}
-	use efi && secureboot_auto_sign --in-place
+	use uefi && secureboot_auto_sign --in-place
 }
diff --git a/sys-block/sas2ircu/Manifest b/sys-block/sas2ircu/Manifest
index a47c6cef4be3..abb62a6e0680 100644
--- a/sys-block/sas2ircu/Manifest
+++ b/sys-block/sas2ircu/Manifest
@@ -1,4 +1,4 @@
 DIST SAS2IRCU_P20.zip 2777958 BLAKE2B ba8c3ef1cf353af90f32a53722b3a7039768c0f48e1d5b48766acdf1c1c05a039692e1edc2586140da5af0f1f2378f4bfaca219895317dc7974004f3aed25343 SHA512 a0a4fa7d07959aa6a81d3540e71e3cc248c23267875ca098da6a80850e008cbdf57b2d6456b5fe17ef890fd39ac550788c9769d169a0673578632f1a8c8a8311
 DIST SAS2_IR_User_Guide.pdf 999388 BLAKE2B 4f1a198ccaa04cf250430106e3254cfb37fd16a1e89861030ed92f52de1d8cff17337709bb641093d78acb44995c03fceff739a0c416f7e3b1692c3b8c6a85dc SHA512 7370b54021978eb543270c992569637092571eaad73896b4bfdf7c7bc45bfd0cb0c6f8f34468255372103f562eb1e3ce2ad30cc6f0d37e7f9bc23f61ee166355
-EBUILD sas2ircu-20.ebuild 3280 BLAKE2B e4b6896ee6a6a1bf378836c80bfe2bfd6ae5cd7a63213cf6ba3d4406f5f947d838b7ee7d678e1efaba0520fb41aa42f600c875b7374112b98a21f1f43baf459b SHA512 9c695cc86179adbf8a3a35bdef356d718c4228f0ef2477145c7b16cc27ed55586c5d6772e9f41472eced43b6df492e80437c47d4dfbfd6ef8c9efe255c1293bb
-MISC metadata.xml 313 BLAKE2B bc8103659b1d003c457aa77253ff241c0045ad4b41ddbe3a921af23a43600c6450653189c3ae9c792453bb19c4c9fab7b41adc9228013c6839dba8b1752f63ac SHA512 7dfc67ef64a07f2faf69ec8e5f2050e7b80e30e19da5a261955346a27d78fc12cefac6abd84e15a4b9cb6dbc7439c6114137bc542424c4a75ed83f0635bea090
+EBUILD sas2ircu-20.ebuild 3283 BLAKE2B 8da002d06e3113ffa13b0b852039a02199aef4531f6c8ff092b92fe3349762ce9606748da984344634970a5a01d59723a81652a4d675ef7b7236234e75c8d08b SHA512 7cd5c7115b5a51cb9c6318e8c9982195d4db9f530225f695deb2334600b2a9d9e35d3108832ff68cc9e7f8caf559b085ed504488ffdfc36b2be74c8876333a47
+MISC metadata.xml 322 BLAKE2B ea9fa3b358b3c5282387144c7123efbc0e87e5a06a90eafc95ccf19077e3eac241f1cd9a8cbfa0226c8f4e91f691ca50f0f457fea1af5cbf8f2bf7d42067dacc SHA512 b76f4d65f9bf12dc239775e31b594e131331b6238eb9ef2832e070cc5eb3070ce8b5cfdd94c26c58e660ab0ceb94fbcd072144c32e2d864f2243316b4f258f51
diff --git a/sys-block/sas2ircu/metadata.xml b/sys-block/sas2ircu/metadata.xml
index 4084cf9b5c1e..d0581956045c 100644
--- a/sys-block/sas2ircu/metadata.xml
+++ b/sys-block/sas2ircu/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>robbat2@gentoo.org</email>
-	<name>Robin H. Johnson</name>
-</maintainer>
-<use>
-	<flag name="efi">Install EFI variant as well</flag>
-</use>
+	<maintainer type="person">
+		<email>robbat2@gentoo.org</email>
+		<name>Robin H. Johnson</name>
+	</maintainer>
+	<use>
+		<flag name="uefi">Install UEFI variant as well</flag>
+	</use>
 </pkgmetadata>
diff --git a/sys-block/sas2ircu/sas2ircu-20.ebuild b/sys-block/sas2ircu/sas2ircu-20.ebuild
index 4e191d3c257e..6113f2cb5019 100644
--- a/sys-block/sas2ircu/sas2ircu-20.ebuild
+++ b/sys-block/sas2ircu/sas2ircu-20.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
+
 inherit mount-boot
 
 DESCRIPTION="LSI MPT-SAS2 controller management tool"
@@ -10,7 +11,7 @@ HOMEPAGE="https://www.broadcom.com/products/storage/host-bus-adapters/sas-9207-8
 LICENSE="LSI"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~ppc64 ~x86 ~x64-solaris"
-IUSE="efi doc"
+IUSE="uefi doc"
 RESTRICT="strip fetch mirror"
 
 DEPEND="app-arch/unzip"
@@ -88,7 +89,7 @@ src_install() {
 	use amd64 || use x86 && doexe sas2ircu_linux_x86_rel/sas2ircu
 	use ppc64 && doexe sas2ircu_linux_x86_rel/sas2ircu
 	use x64-solaris && doexe sas2ircu_solaris_x86_rel/sas2ircu
-	if use efi; then
+	if use uefi; then
 		exeinto /boot/efi/
 		doexe sas2ircu_efi_ebc_rel/sas2ircu.efi
 	fi
diff --git a/sys-block/sas3flash/Manifest b/sys-block/sas3flash/Manifest
index 655dc12fba03..fae48543aa38 100644
--- a/sys-block/sas3flash/Manifest
+++ b/sys-block/sas3flash/Manifest
@@ -2,5 +2,5 @@ DIST Installer_P16_for_Linux.zip 931509 BLAKE2B 059ce415dde9c872bd5e235bd3168a01
 DIST Installer_P16_for_Solaris.zip 450562 BLAKE2B 6aa3ce50128a719fb36d8c9a28f87dc43a4c90f261b373dbe0455f1803dea4212b85efc2c5961a7da9254c21938ff189b893eec44a8e959589df59073517296a SHA512 6a73b142ba50d8c3b6427d96153367e96498787a48bef2ea784fba8567ab9a32554fc8560c3ea798b7f7c04af7a8115d778532087aeca6d7b64fbf4a6be5d649
 DIST Installer_P16_for_UEFI.zip 360466 BLAKE2B 8c98387033bc3979a62c1e29e78678563d32ac9e6a90359160fe64694b765cc083ec1c4e3d816ee9fbcc9390fc195078e4b18976d24c3ed79d93baf69c5bff5d SHA512 f670690df3d024dc968325354650c4279ff9823c6e9846cf37b7a7e3ba0ed77e1a94c8e358c691a41dfd1d438215448cb4fb1df246e5a1e6fa72bbfa3e5ee710
 DIST sas3Flash_quickRefGuide_rev1-0.pdf 301289 BLAKE2B c52a00b7dd6abd14d2a476ed2fca9d56d59555c7f92b802cd37f9876c17d83a9919df6e9c64697eefd2195bec01a1eed14884c3f7daa82195f276032d37a146b SHA512 88129695ac971a28d472f3cea3af8a99fcff508b29b2c7c74994b6854515710239a6bbff766fc4fd31af8726784a3799b2a63a9dd8241e97b34d4e05638e088b
-EBUILD sas3flash-16.ebuild 3277 BLAKE2B fdce88f1040e493cccc31561052b14295389cb4df7c197833d27399bfc1194ce773385f5c723a6641bde533219d1a953f5e46613ed8241e24d8391fdcf20a094 SHA512 8c2d4182661a10f286f4a7b7c8de2503f01211b5c1d4e3a1f9ac954d7297f599e22a80ec0a221a5b4ea4a72f62c2a3fd1a670212ead9744f20ff3f2ef9bddf23
-MISC metadata.xml 314 BLAKE2B 1062c6ed87972d76302d014ecad0a142f00d28fe53e795af91f5aa00005dc3b670a5fcc37e2be116ab18651accd6ef73e4e9751e02e715cfa1f00d0f34832131 SHA512 89bdb85f398818e3bc804e30c461daf7851804a41a95234c92843d260c655aeadacfe19f6f94f8bc94a72c17060e5696132354c109ea9ecca3118162fed3244e
+EBUILD sas3flash-16.ebuild 3282 BLAKE2B d029011b20e1ebdbc22e649e0a2f96a43d847d06ee793488d469bd99c42870243cb1880571d8fd2bb25c45a54ba92f73f9adc4b7f9e407ea8d7d6591ef73f07d SHA512 7722c07831ecab333b789b32771604d133bd61d1fff913510e7ffad097910b1721f45a9d7c65293545cb4a99b9de62b8b81647917357c7f4ea7bdcdbccc5a66d
+MISC metadata.xml 316 BLAKE2B 005f5061dfbc6dfdaa492f5924941dbc8c59b0beb9dc12af726595e154f4786e229a2b0adc235eff622e8d09dc1d33ec894ce9e536ccedf59129df5b8a7643bc SHA512 8bc350aaa15c51e25e286065e95828ab84e2d49e974b4337c295ed02003bcd318e37ec4788a8c5efade9ebb1797116359c7abeea4c2a1f92c2405c3f0ad2db89
diff --git a/sys-block/sas3flash/metadata.xml b/sys-block/sas3flash/metadata.xml
index 55d75d1768a2..c4392c4ef605 100644
--- a/sys-block/sas3flash/metadata.xml
+++ b/sys-block/sas3flash/metadata.xml
@@ -6,6 +6,6 @@
 		<name>Zac Medico</name>
 	</maintainer>
 	<use>
-		<flag name="efi">Install EFI variant as well</flag>
+		<flag name="uefi">Install UEFI variant as well</flag>
 	</use>
 </pkgmetadata>
diff --git a/sys-block/sas3flash/sas3flash-16.ebuild b/sys-block/sas3flash/sas3flash-16.ebuild
index 94f85c44952a..235774821fde 100644
--- a/sys-block/sas3flash/sas3flash-16.ebuild
+++ b/sys-block/sas3flash/sas3flash-16.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit mount-boot secureboot
 
 DESCRIPTION="Flash utility for LSI MPT-SAS3 controller"
@@ -10,7 +11,7 @@ HOMEPAGE="https://www.broadcom.com/products/storage/host-bus-adapters/sas-9300-8
 LICENSE="LSI"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc64 ~x86 ~x64-solaris"
-IUSE="doc efi"
+IUSE="doc uefi"
 
 RESTRICT="strip fetch mirror"
 BDEPEND="app-arch/unzip"
@@ -31,7 +32,7 @@ SRC_URI="
 	x86? ( ${SRC_URI_LINUX} )
 	ppc64? ( ${SRC_URI_LINUX} )
 	x64-solaris? ( ${SRC_URI_SOLARIS} )
-	efi? ( ${SRC_URI_UEFI} )
+	uefi? ( ${SRC_URI_UEFI} )
 	doc? ( "${SRC_URI_BASE}/oracle/files/${DISTFILE_DOC}" )"
 
 S="${WORKDIR}"
@@ -48,7 +49,7 @@ pkg_nofetch() {
 }
 
 pkg_setup() {
-	use efi && secureboot_pkg_setup
+	use uefi && secureboot_pkg_setup
 }
 
 supportedcards() {
@@ -86,7 +87,7 @@ src_install() {
 		DOCS+=( Installer_P"${PV}"_for_Solaris/README_Installer_P"${PV}"_Solaris.txt )
 	fi
 
-	if use efi; then
+	if use uefi; then
 		exeinto /boot/efi/
 		DOCS+=( Installer_P"${PV}"_for_UEFI/README_Installer_P"${PV}"_UEFI.txt )
 		if use amd64; then
diff --git a/sys-block/sas3ircu/Manifest b/sys-block/sas3ircu/Manifest
index f5a57292dfcf..a298f2437eaf 100644
--- a/sys-block/sas3ircu/Manifest
+++ b/sys-block/sas3ircu/Manifest
@@ -1,4 +1,4 @@
 DIST SAS3IRCU_P16.zip 6342932 BLAKE2B a5c4f9a83eb1f51a049e9f04c29c029580590500deb48ae03b0960c394946f1e89d40efc68a0d505004bda519e3174fc573111e95f028c09b1a0ae6bd18f98ed SHA512 cc44d64c500f2608895129414d95cc3d23fae5a3ae39bb28119f150b830ec20b6c934cd1d23dcd1253e9c38ca3b16a7020ae0b8386412638fd2dca6d93d92ac0
 DIST SAS3_IR_UG.pdf 714573 BLAKE2B 09a3a47abf6118343f023f4cdf85ab2f5f583f806e305dafa6397d1099fc01ecc33b331afd10d63ac8bb75a365d09c931c19fc673fa707b5171feb23d64f97bf SHA512 4db16dedcadc3daf853e62531ac620af4a3e41d001b58fcd333692f9121d1ca3ec8b9de0113693506b31da714b9368ff55addb0398f2f843e4a6a1bf3d665433
-EBUILD sas3ircu-16-r1.ebuild 2519 BLAKE2B 1000235314e56dfc3c28339432cedd4ef07d350305a5792cfae499d465106864a5309f4fa0c6f76ebc90c209ae07537eb0cf488090aa033d88aaa33ca94dcacd SHA512 9dd69b38ecea331130f4f60b1398ffacaf8ee62ee00b14bb0f7e7306c1ef6f54e9d9fc9a89dd4b49bb4dc9568b5d6264cb2c3a4834e2d7fd9c865b67f29ec9fe
-MISC metadata.xml 313 BLAKE2B bc8103659b1d003c457aa77253ff241c0045ad4b41ddbe3a921af23a43600c6450653189c3ae9c792453bb19c4c9fab7b41adc9228013c6839dba8b1752f63ac SHA512 7dfc67ef64a07f2faf69ec8e5f2050e7b80e30e19da5a261955346a27d78fc12cefac6abd84e15a4b9cb6dbc7439c6114137bc542424c4a75ed83f0635bea090
+EBUILD sas3ircu-16-r1.ebuild 2522 BLAKE2B dfca6870812dedc7756362c99ac2c7dc4acf85f6048c145bf6b1b6cbbccba6f924cde6bcf20d8acf13eca69022e5ca4191943825d1a34b8d75b68f24808497e4 SHA512 7a9d48ff46bd1687262e455b53df903fd8ce470c5c43e2e69170a19bc99491640394295603916cf99370941fc747a59c42f6e12e7c681f0df2112a1f0c164e48
+MISC metadata.xml 314 BLAKE2B 0d1abced1dc2536da0775f6521e0dee6dac8ffb71b954540d8830dc2d4b1a77ab87e9ee486817152af046f14aaca898a9cdcfcfe9c3a87f43381236362eba095 SHA512 a049b4723f53c4cca6523432a4f1f005d07ec6e5a58224fb7dac65d4ab843c9d90eaa5a8526834010de17bdccb0aac998f03475ee7f1ff612bbe492890fe55ed
diff --git a/sys-block/sas3ircu/metadata.xml b/sys-block/sas3ircu/metadata.xml
index 4084cf9b5c1e..9417faeb6267 100644
--- a/sys-block/sas3ircu/metadata.xml
+++ b/sys-block/sas3ircu/metadata.xml
@@ -6,6 +6,6 @@
 	<name>Robin H. Johnson</name>
 </maintainer>
 <use>
-	<flag name="efi">Install EFI variant as well</flag>
+	<flag name="uefi">Install EFI variant as well</flag>
 </use>
 </pkgmetadata>
diff --git a/sys-block/sas3ircu/sas3ircu-16-r1.ebuild b/sys-block/sas3ircu/sas3ircu-16-r1.ebuild
index 52e553f0eead..2564c4691034 100644
--- a/sys-block/sas3ircu/sas3ircu-16-r1.ebuild
+++ b/sys-block/sas3ircu/sas3ircu-16-r1.ebuild
@@ -23,7 +23,7 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="LSI"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~x64-solaris"
-IUSE="doc efi"
+IUSE="doc uefi"
 RESTRICT="strip fetch mirror"
 
 BDEPEND="app-arch/unzip"
@@ -43,7 +43,7 @@ pkg_nofetch() {
 }
 
 pkg_setup() {
-	use efi && secureboot_pkg_setup
+	use uefi && secureboot_pkg_setup
 }
 
 supportedcards() {
@@ -75,8 +75,8 @@ src_install() {
 	exeinto /opt/lsi/
 	doexe sas3ircu_rel/sas3ircu/sas3ircu_linux_"${ARCH}"_rel/sas3ircu
 
-	if use efi; then
-		if use amd64 || use efi64; then
+	if use uefi; then
+		if use amd64 || use arm64; then
 			exeinto /boot/efi/
 			doexe sas3ircu_rel/sas3ircu/sas3ircu_udk_uefi_"${ARCH}"_rel/sas3ircu.efi
 			secureboot_auto_sign --in-place