gentoo resync : 25.10.2021

3 files changed, 3 insertions, 84 deletions

diff --git a/sys-block/megacli/Manifest b/sys-block/megacli/Manifest
index c4077b46b8b6..ba3dd427ddc4 100644
--- a/sys-block/megacli/Manifest
+++ b/sys-block/megacli/Manifest
@@ -1,5 +1,4 @@
 AUX megacli-wrapper 102 BLAKE2B 15b4c1bcc7102e7c757527e4f8fbb30b4d6eb14773da3690450e010fedecc248b3ff9cfd7f3ad9751cce750de816df98b249ed8f32c9960ac5eef60424f3dede SHA512 b420a93bc930ca346cd76d54871929231d7a7d378c602523d291517c1861b925cb6226a27326559c13b572bc1f9494b6a0abba1526bc02141a8ba1d86f245ec7
 DIST 8-07-14_MegaCLI.zip 7939395 BLAKE2B 3b4151724fab8b9fd2a5797d11919c52cdd5c96fefb6074fad6637a9a82a6d9291dd43e5480669779dbce18f3cb0c56fe119e868a6d6a7c9d05779eb6fccb154 SHA512 ee2b66b69dc41bb678e54f5ccf4908a51e6fde147b2118844ff6248127aa51f12af0e7562c74461d52ea8e9b4345877b21c87fc89210208d80cf2fd3402a93e3
-EBUILD megacli-8.07.14-r2.ebuild 2486 BLAKE2B 9b4b6102240a2e06bb5e229fb9854f36d830143cf86498f9bee4a6bd68ed3b8c9fe5e5426beced13b1ffcebfd95c931c104c3a1571660d8d0aa15138f1275df7 SHA512 ff284da9bc44a143f905e9bde17aa6f26afc6c23eabd86de28e8657dc652b7fda34597beb93be3905239325690875cd12bdf1f85629d7f79f6d3ea066d867bff
-EBUILD megacli-8.07.14-r3.ebuild 2488 BLAKE2B 8009946c72d05a7967184b24ff906f7cf9cf403996f6535c202ae8d27e2e1b290020ad103cfc6186b3836358f5e16ce94caf387af7bcd8b44951c77d7c359d03 SHA512 0c439c3781ca5f4e75384d3cb6acf84973b2b09aebebf28e106928038fcc29366791c452578f44b4d921d1e8f1723d24529f8c1123a47bbfd8cf6d960e68ff9d
+EBUILD megacli-8.07.14-r3.ebuild 2486 BLAKE2B 6fc1d8df7fc476156222cc86cefe79cf28894cfa54036d40a9906194cfb42a2ecb3d8beb9ee6128f9478b7b109ae9e9c22d4e3c64112fc95e500193b30c9bf50 SHA512 b1fbc0e8e49315b32031b73cbae3af593683510208ed2dd97b0edf75d12fd532f588e48b4670c9b4408649f13326b1b38385847895e8421220c4e54cddd952c0
 MISC metadata.xml 319 BLAKE2B 5a45f58f8cc5f61094270415357ea4a684040c69f261e9bc3bc07ef5cf8252e5c1201aac2317c2a14571185e7964fcd706533b15022820d14cb653c8aef1cc14 SHA512 c8e3764dd6248eebe247218e5a53136627fb3117f620ee336d6555f7c6b5fd62fc2eeb287d63120e50efa14496db647363ae3f2047efcfcca7cfde6e7a8fe6aa
diff --git a/sys-block/megacli/megacli-8.07.14-r2.ebuild b/sys-block/megacli/megacli-8.07.14-r2.ebuild
deleted file mode 100644
index 777fb0cbbf06..000000000000
--- a/sys-block/megacli/megacli-8.07.14-r2.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit rpm
-MY_PV="${PV//./-}"
-MY_P=${MY_PV}_MegaCLI
-
-DESCRIPTION="LSI Logic MegaRAID Command Line Interface management tool"
-HOMEPAGE="https://www.broadcom.com/support/knowledgebase/1211161498596/megacli-cheat-sheet--live-examples https://www.broadcom.com/support/knowledgebase/1211161496959/megacli-commands"
-# This file is '[zip]	MegaCLI 5.5 P2', Date: 01/20/2014   Size: 7753 KB
-SRC_URI="https://docs.broadcom.com/docs-and-downloads/raid-controllers/raid-controllers-common-files/${MY_P}.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 x86"
-IUSE=""
-
-DEPEND="app-arch/unzip
-	app-admin/chrpath"
-RDEPEND="sys-libs/ncurses-compat:5"
-
-S=${WORKDIR}
-
-# Previous releases from LSI directly required a click-through EULA; but the
-# upstream website no longer requires this consistently: most old files have
-# two or more download pages, and while one of the pages has a generic
-# click-through download form, the file-specific download page only requires
-# click-through on some items. See also sys-block/lsiutil
-RESTRICT="mirror bindist"
-QA_PREBUILT="/opt/${PN}/${PN}
-	/opt/${PN}/lib/*"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	rpm_unpack ./Linux/MegaCli-${PV}-1.noarch.rpm
-}
-
-src_install() {
-	newdoc "${PV}_MegaCLI.txt" RELEASE.txt
-
-	exeinto /opt/megacli
-	libsysfs=libstorelibir-2.so.14.07-0
-	case ${ARCH} in
-		amd64) MegaCli=MegaCli64;;
-		x86) MegaCli=MegaCli;;
-		*) die "invalid ARCH";;
-	esac
-	newexe opt/MegaRAID/MegaCli/${MegaCli} ${PN}
-
-	exeinto /opt/${PN}/lib
-	doexe opt/MegaRAID/MegaCli/${libsysfs}
-
-	into /opt
-	newbin "${FILESDIR}"/${PN}-wrapper ${PN}
-	dosym ${PN} /opt/bin/MegaCli
-
-	# Remove DT_RPATH
-	chrpath -d "${D}"/opt/${PN}/${PN}
-}
-
-pkg_postinst() {
-	einfo
-	einfo "See /usr/share/doc/${PF}/RELEASE.txt for a list of supported controllers"
-	einfo "(contains LSI model names only, not those sold by 3rd parties"
-	einfo "under custom names like Dell PERC etc)."
-	einfo
-	einfo "As there's no dedicated manual, you might want to have"
-	einfo "a look at the following cheat sheet (originally written"
-	einfo "for Dell PowerEdge Expandable RAID Controllers):"
-	einfo "http://tools.rapidsoft.de/perc/perc-cheat-sheet.html"
-	einfo
-	einfo "For more information about working with Dell PERCs see:"
-	einfo "http://tools.rapidsoft.de/perc/"
-	einfo
-}
diff --git a/sys-block/megacli/megacli-8.07.14-r3.ebuild b/sys-block/megacli/megacli-8.07.14-r3.ebuild
index ed3a7f8c02de..240d079dd480 100644
--- a/sys-block/megacli/megacli-8.07.14-r3.ebuild
+++ b/sys-block/megacli/megacli-8.07.14-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ 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 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="app-arch/unzip