diff --git a/sys-block/sas3ircu/sas3ircu-16.ebuild b/sys-block/sas3ircu/sas3ircu-16-r1.ebuild
similarity index 62%
rename from sys-block/sas3ircu/sas3ircu-16.ebuild
rename to sys-block/sas3ircu/sas3ircu-16-r1.ebuild
index bbd2cebcd65be..52e553f0eead0 100644
--- a/sys-block/sas3ircu/sas3ircu-16.ebuild
+++ b/sys-block/sas3ircu/sas3ircu-16-r1.ebuild
@@ -1,35 +1,35 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
+
+MY_P="${PN^^}_P${PV}"
+
+DISTFILE_BIN="${MY_P}.zip"
+DISTFILE_DOC="SAS3_IR_UG.pdf"
+SRC_URI_BASE="https://docs.broadcom.com/docs-and-downloads/host-bus-adapters"
+
 inherit mount-boot secureboot
 
 DESCRIPTION="LSI MPT-SAS3 controller management tool"
 HOMEPAGE="https://www.broadcom.com/products/storage/host-bus-adapters/sas-9300-8e#downloads"
-
-LICENSE="LSI"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~x64-solaris"
-IUSE="doc efi"
-
-RESTRICT="strip fetch mirror"
-BDEPEND="app-arch/unzip"
-QA_PREBUILT="opt/lsi/sas3ircu boot/efi/sas3ircu.efi"
-
-MY_PN=SAS3IRCU
-MY_P="${MY_PN}_P${PV}"
-
-DISTFILE_BIN=${MY_P}.zip
-DISTFILE_DOC=SAS3_IR_UG.pdf
-
-SRC_URI_BASE='https://docs.broadcom.com/docs-and-downloads/host-bus-adapters'
 SRC_URI="
 	${SRC_URI_BASE}/host-bus-adapters-common-files/sas_sata_12g_p${PV}/${DISTFILE_BIN}
 	https://docs.broadcom.com/docs/${DISTFILE_BIN}
-	doc? ( "${SRC_URI_BASE}/${DISTFILE_DOC}" )"
-
+	doc? ( "${SRC_URI_BASE}/${DISTFILE_DOC}" )
+"
 S="${WORKDIR}/${MY_P}"
 
+LICENSE="LSI"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~x64-solaris"
+IUSE="doc efi"
+RESTRICT="strip fetch mirror"
+
+BDEPEND="app-arch/unzip"
+
+QA_PREBUILT="opt/lsi/sas3ircu boot/efi/sas3ircu.efi"
+
 pkg_nofetch() {
 	elog "Broadcom has a mandatory click-through license on thier binaries."
 	elog "Please visit ${HOMEPAGE} and download ${DISTFILE_BIN} from the Mangement Software section."
@@ -61,33 +61,28 @@ supportedcards() {
 src_install() {
 	# The second number is some sort of internal revision that is inconsistent between releases.
 	local DOCS=( IRCU_MPT_GEN3_Phase"${PV}".0-*.pdf "README_SAS3IRCU_P${PV}.txt" )
-
-	if use doc; then
-		DOCS+=( "${DISTDIR}/${DISTFILE_DOC}" )
-	fi
+	use doc && DOCS+=( "${DISTDIR}/${DISTFILE_DOC}" )
 
 	default
 
+	local ARCH
+	use amd64 && ARCH="x64"
+	use arm64 && ARCH="arm"
+	use ppc64 && ARCH="ppc64"
+	use x64-solaris && ARCH="solaris_x86"
+	use x86 && ARCH="x86"
+
 	exeinto /opt/lsi/
-	if use amd64; then
-		doexe sas3ircu_rel/sas3ircu/sas3ircu_linux_x64_rel/sas3ircu
-	elif use x86; then
-		doexe sas3ircu_rel/sas3ircu/sas3ircu_linux_x86_rel/sas3ircu
-	elif use arm64; then
-		doexe sas3ircu_rel/sas3ircu/sas3ircu_linux_arm_rel/sas3ircu
-	elif use ppc64; then
-		doexe sas3ircu_rel/sas3ircu/sas3ircu_linux_ppc64_rel/sas3ircu
-	elif use x64-solaris; then
-		doexe sas3ircu_rel/sas3ircu/sas3ircu_solaris_x86_rel/sas3ircu
-	fi
+	doexe sas3ircu_rel/sas3ircu/sas3ircu_linux_"${ARCH}"_rel/sas3ircu
 
 	if use efi; then
-		exeinto /boot/efi/
-		if use amd64; then
-			doexe sas3ircu_rel/sas3ircu/sas3ircu_udk_uefi_x64_rel/sas3ircu.efi
-		elif use arm64; then
-			doexe sas3ircu_rel/sas3ircu/sas3ircu_udk_uefi_arm_rel/sas3ircu.efi
+		if use amd64 || use efi64; then
+			exeinto /boot/efi/
+			doexe sas3ircu_rel/sas3ircu/sas3ircu_udk_uefi_"${ARCH}"_rel/sas3ircu.efi
+			secureboot_auto_sign --in-place
 		fi
-		secureboot_auto_sign --in-place
 	fi
+
+	dodir /opt/bin
+	dosym ../lsi/sas3ircu /opt/bin/sas3ircu
 }