gentoo christmass resync : 25.12.2020

3 files changed, 65 insertions, 2 deletions

diff --git a/sys-block/storcli/Manifest b/sys-block/storcli/Manifest
index d52acfa40956..a019dd705e35 100644
--- a/sys-block/storcli/Manifest
+++ b/sys-block/storcli/Manifest
@@ -11,6 +11,7 @@ DIST storcli-7.1017.zip 36266095 BLAKE2B e1bb4c6bbd19712530fc8d3d7917bf943221f12
 DIST storcli-7.1211.zip 36988201 BLAKE2B 487dda0c78af60d96dc6eb8bc0c7074dd99719acc4faf10027430ea80a5d1cb76e6bdc9eaf0931967c5cdf10d80ee824f45118144bfc032a4ddce52d678df354 SHA512 f28ae41adf2286153ecd57f7d022940069356c9636e45aaae4ae45215487bbb8e3dea51fa4aa00b9e9340069036c1be21b186ce177e0fd0a6a0bb786cb58181f
 DIST storcli-7.1316.zip 37136466 BLAKE2B 7bca2e1b330f40e66945567ac8fad04d448993ff7ab4a4d846a0b6142fbe3988ab00775aa3897e3268e30b34cb7659e96f75d2383d3e85e4bec433edde5ba17e SHA512 049b34d44bb1140ad804f6bb6d8fb133ac9bbc4aface721051e713c7a1056acb0f894f4f4793ef9e02e48958a745d12bc5389e7e763716c780fb1c2c387e34d6
 DIST storcli-7.1410.zip 34424559 BLAKE2B cb0b613d0ccbf6ac36d1aace9174286ffe89d0602c7bca3b2712abcdba1b82cc2498de686e815e01fa125920c94d780e2f7fa4ab2ff570dc42818f4c4f491da4 SHA512 4887d434757f15e931c3c3c57b2316fc0cf0a5284c6009601b58c9585b73f9b9c9a0318dd3c4472cd3578aa5ec12b641a371db1d726a637741f6f0b34dd1f3e7
+DIST storcli-7.1508.zip 35678755 BLAKE2B 9fb8da35be491afaea3a288b5c4c1ed0806fa9d6831e9a6dbf14d4c00469b1ce6e9d8fe9a98ce64505580420b5c145f002338d3029794af4c54779d9f324ec56 SHA512 43565cc695e9e7a7725474ab8091ea00de8fde7fabffe708c45e4c0e8713b1fcb1a5a25963bba44974b7787bebc06a59f3b8180416fefb0a54b4fd403c6152be
 EBUILD storcli-1.19.04.ebuild 2061 BLAKE2B 4325ee37d40cec579ec666a21729c157992db6e71dd52ef0686dd555be2d3fe3b6aad15785427b65dbb0b677a1ce80079a0d08e2fb871d10d230a1bc5d867149 SHA512 f267f5faa8e9d3951b3e166915c9cb090702ae0bf751d923e8206ce73628bf82777965e156e40bb864434b1855af3488bcd5c1ac7748537fff567a2f5964a083
 EBUILD storcli-1.20.15.ebuild 2074 BLAKE2B 8b6fd28e3be1b8895c393ce38d844d85a9d80bca8d8c58be6c7e5f4a8c3560bc219b5e3a3d891cea6a2d274762319fd18c44e3200aa1238abb6a4cd5d2a3c5df SHA512 07da506f5535aa55195dbc8ca04564e7e88073cc61a2ec94f513ce877b156618c8092290793558495ff339273dc8d1b9f02ed07cb35138ff4fdc2301ee021564
 EBUILD storcli-1.21.06.ebuild 2667 BLAKE2B 71249f138b350ca36f6fec6e64672ce923b80e982baac3666e844bd98fcd7ea18c3527b14299f05a9b8c720b3ea39cd25abb4c3bd1d3394bec4ce281203d9c23 SHA512 657a80558476e4134fc2821c5aa9f8de0b3dc6ff3ee38a9385be538f310006d725b52683fd56ead278eb92c57413d3a3096fb09792af93854248cc9aab69c598
@@ -21,5 +22,6 @@ EBUILD storcli-7.0709-r1.ebuild 2345 BLAKE2B 3a03247560eceebed6c1413850607eb7c2b
 EBUILD storcli-7.1017.ebuild 1806 BLAKE2B 31822ab31c50bbb0cf00bc126479888a1fd199a9304ab891f4c0dda0867c9f1e4aca7c62b484842e3bd84dee8ed57f7a1ef270b987fcc0156dc168d1ae033819 SHA512 abde801f76ff804ea33d14ab25b051743a9fe8d366b8663ad919e828fa4b10f6fd68c1b9e3b934b9c4447533657a689d5f324a09b9bae5424245fee5ec988b74
 EBUILD storcli-7.1211.ebuild 1822 BLAKE2B eeedf7c5527b0e14c6eb0ae2c619e9d1d941f42a18fafaa37d293a788a43c59f7967a67e2158498439a89ae7d6420ca8f673254d2e6f6a8efaa7811a32bb91b3 SHA512 f5b8660ae5f859ec7ae5e9ae3fb3b142e004be55c0c1a1c357ea70204f77b9cb0248c635305e5c49361a0de8b3f92fc44dab198c03483b107679ecf311abcccb
 EBUILD storcli-7.1316.ebuild 1822 BLAKE2B 3939bd238e40a3e41503efd7e5c8c87057b5b65511b985eff5530ffa661a445cb0818f870d5d64f18fd2b2f21dcf47365d225495146d4276b257f67a8cd05ac6 SHA512 b3661ca4af4e6308d1f87c0e8dff2b3b46b40df31f6fa7201fc80a3a4727fcdf39d7a7fb475674c41e3fd4d1a8ed5a2061a5328fe1ebd754141b7a079b6e7d10
-EBUILD storcli-7.1410.ebuild 1702 BLAKE2B 4d51a6d3db4a53bd6b7d896ba2976b13342289fa6c8c44e297e730672a845cef8fa998452fe81ef7c069b9e206b277ab184d5ca284af68fa608da07e5348d3e5 SHA512 f01cfdde3b43c42b5c90d9dd0feecfa48aa339e47c2186df23a30a9d674354d27cdc9372e0cc0b69f4df9de92a17b3994a35e84a5e26e3bb23626962fa6dd09c
+EBUILD storcli-7.1410.ebuild 1701 BLAKE2B 706ca8f5b08be1d5bbd552daa202ab419fe844b50d48336762c9131a69a6f4310a822d94d8a6ecebca8532f5f4dd19f3b89cf753687e268da437d5597741a999 SHA512 95501c39002179a6c2f81073c073dc28bb5fc9cad98580bb7cae9bcde286fa7e20644e1fc2df07f50ddcd9b52e8e12cf71ae0d555053f3e74f632111a6e62fee
+EBUILD storcli-7.1508.ebuild 1687 BLAKE2B ee640a302e94533891ba235f9d75f6e78750db54ed80c08a9bfd0765ebe7d330f57a725b484788fc63be9a1959dc8b59550540e40637ee41b942babe6c079b7d SHA512 3e9ac6899cb5bb254a03237bf8932dba6b6cd191299fab1eb2bbefda9c4c37dfb9cf1e363cf8db37371f6c8b3262b38071efd4aaf454e4dbe4d4591d39110271
 MISC metadata.xml 251 BLAKE2B fb85d245662fa1577cfe1d77526bd34fb2a674dd447192f2defe78b751423e3d14ae73efd3ac0e1e5e6fdb6259622a782e724ec77021faf526509f199dd20d61 SHA512 46942a98ef7e36470d1169a5bc8839d25603e33c143cd36327a8a85fc14cb6bfb32247eb7608d92cc58a06cc8eef5bd64d6ec2d21e69a88632e4b936598aa772
diff --git a/sys-block/storcli/storcli-7.1410.ebuild b/sys-block/storcli/storcli-7.1410.ebuild
index cd0ac4c6ba7d..fdae103d9b5d 100644
--- a/sys-block/storcli/storcli-7.1410.ebuild
+++ b/sys-block/storcli/storcli-7.1410.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://docs.broadcom.com/docs-and-downloads/docs-and-downloads/raid-co
 
 LICENSE="Avago LSI BSD"
 SLOT="0/7.14"
-KEYWORDS="-* ~amd64"
+KEYWORDS="-* amd64"
 IUSE=""
 
 RDEPEND=""
diff --git a/sys-block/storcli/storcli-7.1508.ebuild b/sys-block/storcli/storcli-7.1508.ebuild
new file mode 100644
index 000000000000..ae266864ee4f
--- /dev/null
+++ b/sys-block/storcli/storcli-7.1508.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit pax-utils toolchain-funcs
+
+# Upstream is still using strange version numbers
+MY_PV="007.1508.0000.0000"
+
+DESCRIPTION="MegaRAID StorCLI (successor of the MegaCLI)"
+HOMEPAGE="https://www.broadcom.com/support/download-search?dk=storcli"
+SRC_URI="https://docs.broadcom.com/docs-and-downloads/raid-controllers/raid-controllers-common-files/${MY_PV}_Unified_StorCLI-PUL.zip -> ${P}.zip"
+
+LICENSE="Avago LSI BSD"
+SLOT="0/7.15"
+KEYWORDS="-* ~amd64"
+IUSE=""
+
+RDEPEND=""
+DEPEND="app-arch/unzip"
+
+MY_STORCLI_BASEDIR="/opt/lsi/storcli"
+
+QA_PRESTRIPPED="${MY_STORCLI_BASEDIR:1}/storcli
+	${MY_STORCLI_BASEDIR:1}/storcli32"
+QA_PREBUILT=${QA_PRESTRIPPED}
+
+src_unpack() {
+	mkdir srcfiles || die
+	pushd srcfiles &>/dev/null || die
+	default
+	mv Unified_storcli_all_os/Ubuntu/storcli_*.deb "${WORKDIR}" || die "Failed to move storcli_*.deb"
+	popd &>/dev/null || die
+
+	rm -rf srcfiles || die
+
+	# Unpack Ubuntu package which will be our $S content
+	unpack "${WORKDIR}"/storcli_*.deb
+	rm -f storcli_*.deb || die "Failed to cleanup storcli_*.deb package"
+	unpack "${WORKDIR}"/data.tar.xz
+
+	mkdir "${S}" || die "Failed to create '${S}'"
+}
+
+src_prepare() {
+	default
+
+	# Create clean $S
+	mv "${WORKDIR}"/opt/Mega*/storcli/* "${S}" || die "Failed to move storcli_.deb content to '${S}'"
+	rm -rf "${WORKDIR}"/{opt,control.tar.gz,data.tar.gz,debian-binary} || die "Failed to cleanup no longer needed files"
+}
+
+src_install() {
+	exeinto "${MY_STORCLI_BASEDIR}"
+	newexe storcli64 storcli
+
+	dosym "${MY_STORCLI_BASEDIR}"/storcli /usr/sbin/storcli
+
+	pax-mark m "${D}${MY_STORCLI_BASEDIR}"/storcli
+}