gentoo auto-resync : 17:06:2024 - 00:09:46

2 files changed, 34 insertions, 29 deletions

diff --git a/sys-block/sas2ircu/Manifest b/sys-block/sas2ircu/Manifest
index abb62a6e0680..5489acaf7b7e 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 3283 BLAKE2B 8da002d06e3113ffa13b0b852039a02199aef4531f6c8ff092b92fe3349762ce9606748da984344634970a5a01d59723a81652a4d675ef7b7236234e75c8d08b SHA512 7cd5c7115b5a51cb9c6318e8c9982195d4db9f530225f695deb2334600b2a9d9e35d3108832ff68cc9e7f8caf559b085ed504488ffdfc36b2be74c8876333a47
+DIST SAS2IRCU_User_Guide.pdf 794046 BLAKE2B e976f57ada3c51b58bfee24cd2f5d059f59b48bf388d93b146238d54aa09b06f6d450e3ccf149903871dfcdb32807a35d6f379738e149b410b7c1279f811153f SHA512 515869794be428ffbefcbfadac992912fb0eebab0cda640b315b4a231b5f25f1205978605f108b9009380015f3058c47e0ce4352c693ef23ab31980ea8b821a0
+EBUILD sas2ircu-20-r1.ebuild 3334 BLAKE2B 851043a8e4544bf54eb4bc28d95ee4dab4d51127173664dfc4d3845aa16d15189b60135c7eb67894fe22c34bc6ac8d293589765bd66fd2ebeec8d9fd6a7dadb0 SHA512 df886d7f749708526d39dafde832cd636ab08e5f5bc13ba96961b831e0ce5b8a723d45d48f153f5ee34a2e3af5cc5c83f5887d5753194868bf539b3eca89bef8
 MISC metadata.xml 322 BLAKE2B ea9fa3b358b3c5282387144c7123efbc0e87e5a06a90eafc95ccf19077e3eac241f1cd9a8cbfa0226c8f4e91f691ca50f0f457fea1af5cbf8f2bf7d42067dacc SHA512 b76f4d65f9bf12dc239775e31b594e131331b6238eb9ef2832e070cc5eb3070ce8b5cfdd94c26c58e660ab0ceb94fbcd072144c32e2d864f2243316b4f258f51
diff --git a/sys-block/sas2ircu/sas2ircu-20.ebuild b/sys-block/sas2ircu/sas2ircu-20-r1.ebuild
index 6113f2cb5019..6fc257827999 100644
--- a/sys-block/sas2ircu/sas2ircu-20.ebuild
+++ b/sys-block/sas2ircu/sas2ircu-20-r1.ebuild
@@ -1,48 +1,48 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
-inherit mount-boot
+MY_PN=SAS2IRCU
+MY_P="${MY_PN}_P${PV}"
+
+DISTFILE_BIN=${MY_P}.zip
+DISTFILE_DOC="SAS2IRCU_User_Guide.pdf"
+DOC_PV=12
+SRC_URI_BIN="https://docs.broadcom.com/docs/${DISTFILE_BIN}"
+# This is "SAS-2 Integrated RAID Configuration Utility (SAS2IRCU) User Guide"
+# and replaces the older SAS2_IR_User_Guide.pdf.
+# It contains additional material compared to the older PDF.
+SRC_URI_DOC="https://docs.broadcom.com/doc/12353380"
+
+inherit mount-boot secureboot
 
 DESCRIPTION="LSI MPT-SAS2 controller management tool"
 HOMEPAGE="https://www.broadcom.com/products/storage/host-bus-adapters/sas-9207-8e#tab-archive-drivers4-abc"
+SRC_URI="
+${SRC_URI_BIN}
+doc? ( ${SRC_URI_DOC} -> ${DISTFILE_DOC} )
+"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="LSI"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~ppc64 ~x86 ~x64-solaris"
-IUSE="uefi doc"
+IUSE="doc uefi"
 RESTRICT="strip fetch mirror"
 
-DEPEND="app-arch/unzip"
-RDEPEND=""
+BDEPEND="app-arch/unzip"
 QA_PREBUILT="opt/lsi/sas2ircu boot/efi/sas2ircu.efi"
 
-MY_PN=SAS2IRCU
-MY_P="${MY_PN}_P${PV}"
-
-DISTFILE_BIN=${MY_P}.zip
-DISTFILE_DOC=SAS2_IR_User_Guide.pdf
-DOC_PV=12
-
-SRC_URI="
-https://docs.broadcom.com/docs/${DISTFILE_BIN}
-https://docs.broadcom.com/docs-and-downloads/host-bus-adapters/host-bus-adapters-common-files/sas_sata_6g_p20_point6/$DISTFILE_BIN
-doc? ( https://docs.broadcom.com/docs-and-downloads/host-bus-adapters/host-bus-adapters-common-files/SAS2_IR_User_Guide.pdf )
-"
-
 LICENSE_URL="http://www.lsi.com/cm/License.do?url=&prodName=&subType=Miscellaneous&locale=EN"
 
-S="${WORKDIR}/${MY_P}"
-
 pkg_nofetch() {
 	elog "LSI has a mandatory click-through license on thier binaries."
-	elog "Please visit $HOMEPAGE and download ${DISTFILE_BIN} from the Management Software and Tools section."
-	elog "If the file has been moved again, the license form might be available at https://docs.broadcom.com/docs/${DISTFILE_BIN}"
+	elog "Please visit ${SRC_URI_BIN} to agree to the license and download the binary."
 	elog "After downloading, move ${DISTFILE_BIN} into your DISTDIR directory"
 	if use doc; then
-		elog "Please also download 'SAS-2 Integrated RAID Configuration Utility User Guide' (${DISTFILE_DOC}) "
-		elog "and also place it into your DISTDIR directory"
+		elog "Please also download 'SAS-2 Integrated RAID Configuration Utility User Guide' at ${SRC_URI_DOC}"
+		elog "and also place it into your DISTDIR directory, named ${DISTFILE_DOC}"
 	fi
 }
 
@@ -90,10 +90,15 @@ src_install() {
 	use ppc64 && doexe sas2ircu_linux_x86_rel/sas2ircu
 	use x64-solaris && doexe sas2ircu_solaris_x86_rel/sas2ircu
 	if use uefi; then
-		exeinto /boot/efi/
-		doexe sas2ircu_efi_ebc_rel/sas2ircu.efi
+		if use amd64; then
+			exeinto /boot/efi/
+			doexe sas2ircu_efi_ebc_rel/sas2ircu.efi
+			secureboot_auto_sign --in-place
+		fi
 	fi
 	dodoc Readme_Release_Notes_SAS2IRCU_Phase_${PV}.00.00.00.txt
 	dodoc SAS2IRCU_Phase${PV}.0-${PV}.00.00.00.pdf
-	use doc && dodoc "${DISTDIR}"/$DISTFILE_DOC
+	use doc && dodoc "${DISTDIR}"/${DISTFILE_DOC}
+	dodir /opt/bin
+	dosym ../lsi/sas2ircu /opt/bin/sas2ircu
 }