gentoo resync : 25.11.2020

3 files changed, 12 insertions, 66 deletions

diff --git a/sys-block/lsiutil/Manifest b/sys-block/lsiutil/Manifest
index a4d05dccd857..c9df61b2e69a 100644
--- a/sys-block/lsiutil/Manifest
+++ b/sys-block/lsiutil/Manifest
@@ -1,5 +1,3 @@
 DIST LSIUtil_1-62.zip 2344606 BLAKE2B 4b9cfef2a5ec920dfb19b2dcd34754a211b93ab82489d2eb8a6ff92729bb91c9fcb879a0997b8c7efc1b607b3a45843b89b6ad817745b2ea72a932ed5eeed4b2 SHA512 85de9ce20efe881e4f05fb4025031ce8c5f0b506912e813975c2e10600fa87f9c6f0147d274349f47c618ef996b7b5331b0328630ec2d153a3afe69557ba63f2
-DIST LSIUtil_1.62.zip 2544375 BLAKE2B 727619aa73bab1ede7c3e1765062313f1819493b8aef3a37523ae2d6b152704060addcef0b81a72fc4100e3d139f6b30294e6f912962cc99ccec35a692d840fe SHA512 65f68cf584b109e557ccc021412a922f867149c82060289e126186ff168b183ba325dcf3421f8275a4b34585a90ff3ef2848d1e8bfb7b386816d2ae7f5e9dd08
-EBUILD lsiutil-1.62-r1.ebuild 1032 BLAKE2B bcf5d12902193f4709b5ca0b8f3315aff35b226cfce19248652bae15eba21726c02856427e9f2e8c82797f74eecd431124da0b448b55f58ed9bc9c279cdd27f1 SHA512 08c16a06cd35bb8b1bc21618d8385837c208f13ddb7778d60ce8487d55a2e7b1fa7da17a70df6af673df5e8632a45b036e63dfdad7ed2a3e4c59f2f46d3b6ed6
-EBUILD lsiutil-1.62-r2.ebuild 904 BLAKE2B f5cfde9e1aa0f244f82cce9540b32d51f054d8f197f2106bf4e6c956816b301b15358cbb197f247f9d4e6e29f2f4fbcb8a967f12a7128b5908c213c078529fed SHA512 473c294c365c3e6734e123b95de15e9ac828b8aa06f7e850aed0b846ad68e8608d838343d2f78cf57f572f2aab50f90b965de081a5952e790b2e190b478a2c14
+EBUILD lsiutil-1.62-r3.ebuild 815 BLAKE2B 672a98906b67ad880847632629eb354c1f5470f2c09af8ed38f413ad6971f6ccfab5c9780cb67427bac59f9cec3d14b6d7db9ee847710704d23b934d3315bd22 SHA512 1eccdc23398f9eb0dc791ea01d62a2d44ab7c569a4a184bcfa0e75095d50ae5e98040482459a2d7087f6027477bf854915a9ced33b3edd9c29a759f06e4cef27
 MISC metadata.xml 318 BLAKE2B 98c2744d890564a2aee5a9541954654e57d97c3a30ca9d2470afb2d0d63935eadf02d7745b617bb9f0d076bc449ed5f10fbf4610226d3f701077d6e4c3929ab9 SHA512 d2c34bba25ecc086ba1e3e009fbcf56d40efa3522cbc8d1fd4e273a58d21d82c2fd159c25e9295939f713e1ed845d361645915060fef9bc71be9be3d4ef043ee
diff --git a/sys-block/lsiutil/lsiutil-1.62-r1.ebuild b/sys-block/lsiutil/lsiutil-1.62-r1.ebuild
deleted file mode 100644
index cb29c7db8358..000000000000
--- a/sys-block/lsiutil/lsiutil-1.62-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-DESCRIPTION="LSI Logic Fusion MPT Command Line Interface management tool"
-HOMEPAGE="http://www.lsi.com/"
-SRC_URI="http://www.lsi.com/downloads/Public/Obsolete/Obsolete%20Common%20Files/LSIUtil_${PV}.zip"
-
-LICENSE="LSI"
-SLOT="0"
-# This package can never enter stable, it can't be mirrored and upstream
-# can remove the distfiles from their mirror anytime.
-KEYWORDS="~amd64 ~ia64 ~x86"
-IUSE=""
-
-RESTRICT="fetch mirror bindist"
-
-RDEPEND=""
-DEPEND="app-arch/unzip"
-
-QA_PRESTRIPPED="/opt/bin/lsiutil"
-
-S="${WORKDIR}"
-
-pkg_nofetch() {
-	einfo "Upstream has implemented a mandatory clickthrough EULA for distfile download"
-	einfo "Please visit $SRC_URI"
-	einfo "And place $A into your DISTDIR directory"
-}
-
-src_install() {
-	exeinto /opt/bin
-
-	if use x86; then
-		doexe Linux/lsiutil
-	elif use amd64; then
-		newexe Linux/lsiutil.x86_64 lsiutil
-	elif use ia64; then
-		newexe Linux/lsiutil.ia64 lsiutil
-	fi
-
-	dodoc changes.txt
-}
diff --git a/sys-block/lsiutil/lsiutil-1.62-r2.ebuild b/sys-block/lsiutil/lsiutil-1.62-r3.ebuild
index c9cb2cb12fa7..1208722bd953 100644
--- a/sys-block/lsiutil/lsiutil-1.62-r2.ebuild
+++ b/sys-block/lsiutil/lsiutil-1.62-r3.ebuild
@@ -1,38 +1,30 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
 DESCRIPTION="LSI Logic Fusion MPT Command Line Interface management tool"
-HOMEPAGE="http://www.avagotech.com/"
-SRC_URI="http://docs.avagotech.com/docs-and-downloads/legacy-host-bus-adapters/legacy-host-bus-adapters-common-files/LSIUtil_${PV/./-}.zip"
+HOMEPAGE="https://www.broadcom.com/"
+SRC_URI="https://docs.broadcom.com/docs-and-downloads/legacy-host-bus-adapters/legacy-host-bus-adapters-common-files/LSIUtil_${PV/./-}.zip"
 
-LICENSE="LSI"
-SLOT="0"
 # This package can never enter stable, it can't be mirrored and upstream
 # can remove the distfiles from their mirror anytime.
+LICENSE="LSI"
+SLOT="0"
 KEYWORDS="~amd64 ~ia64 ~x86"
-IUSE=""
-
 RESTRICT="mirror bindist"
 
-RDEPEND=""
-DEPEND="app-arch/unzip"
+BDEPEND="app-arch/unzip"
 
-QA_PRESTRIPPED="/opt/bin/lsiutil"
+QA_PREBUILT="*"
 
 S="${WORKDIR}"
 
 src_install() {
 	exeinto /opt/bin
-
-	if use x86; then
-		doexe Linux/lsiutil
-	elif use amd64; then
-		newexe Linux/lsiutil.x86_64 lsiutil || die
-	elif use ia64; then
-		newexe Linux/lsiutil.ia64 lsiutil || die
-	fi
+	use amd64 && newexe Linux/lsiutil.x86_64 lsiutil
+	use ia64 && newexe Linux/lsiutil.ia64 lsiutil
+	use x86 && doexe Linux/lsiutil
 
 	dodoc changes.txt
 }