gentoo resync : 15.01.2020

7 files changed, 85 insertions, 15 deletions

diff --git a/sys-block/storcli/Manifest b/sys-block/storcli/Manifest
index 0ade820d8617..f55ac16e0a3c 100644
--- a/sys-block/storcli/Manifest
+++ b/sys-block/storcli/Manifest
@@ -8,12 +8,14 @@ DIST storcli-7.0504.zip 40558670 BLAKE2B 3cd54b47b42e5bb8329ccd4b09a6c0863347a04
 DIST storcli-7.0606.zip 36634159 BLAKE2B 56cae14537872ef23d8ddc6a0790b727abdf4abecd06b9d1615dc4ad0a554a48bdd077772181d2f0ad9bbe90f015130b4a62caa16b1f02d042403cb6ca389e04 SHA512 ef8bc6b275bb915707624d73d802e84e7a04da087d275055916f047f16d15f1303047c9eb53eae8de88da97ce82fc79616822888fc320af7ba54ad6aa2999996
 DIST storcli-7.0709.zip 25844769 BLAKE2B f44791d0813f348068a89a14a0ea457667ab8e224da09a458bfd1126f5e1d9f19655f5392a8d2a8a04ae07f76fc3c91abcdbd48a058c8e9d517c504de8688e66 SHA512 c3995110b592bbf6e58a0e54f62ddbdbb025c6d27ce56111a40d9eb04b7d5ee7a9bfc76e449b0b4900e1082f20df8e06a852a3fe0efc1114158d104036f6033e
 DIST storcli-7.1017.zip 36266095 BLAKE2B e1bb4c6bbd19712530fc8d3d7917bf943221f121d0a7d5d3e44205f73bab408d7e4ff94d8cac479a1b834b82e8bdb6661805ca13f1695f8bad52d69d2c988fe9 SHA512 fb4b45fa577417627e67d20bbfa2e07512fe600ffeb9d21e11a80e25208f17b56fb25fa74a9777622c72012a605813b0206a990a6d4191f6b57371bd1d72fd6b
-EBUILD storcli-1.19.04.ebuild 2050 BLAKE2B 50e963ae4290d138661fc3b3f95a692c2e230267fc2b0c12440ec5ce68e08c9167248d2addcbac9b6d5e20456124e9398e1e60cd6524820d7121dfa06528bc89 SHA512 4b0697daca02917b91c5efb2cbbf9145af30a19ed9adb7b0279cb3b8b1a94819b2b23ff46bee7895bf016249402e2c8da467d92c25201995d8227aabbbbc298c
-EBUILD storcli-1.20.15.ebuild 2063 BLAKE2B a660891695ad51e079658f04be6a1333883326c6f36dea59bc798fa93e698efc66e2470892464f5b6ec2fcc5f67d27aaccf05aa34b21e899b0d18e1f721e6607 SHA512 8e6a5ebe11f74fc0351a1983dbc19d1cfe527513dc3f927567e500667755fbf921a531a4b41ebc59d430a6cddb36d0266e40a68c648b87f6de4be9ecffddbe33
-EBUILD storcli-1.21.06.ebuild 2656 BLAKE2B 272ee62c3fa026de02d750ca3c5bd2f6267ee2c2262fe61ae68c39ad0692271f55bdc1188cb5a004603f93ab9f97a8d2ef16cc163336a8b92995a4420cc7817d SHA512 ff8dfdfe0bbd8e7e520f76150aec96d7873cb7b17b88ed68a2d9d8ed6fa1e74f7a4ef2606cdc6a1eb7a1769899f03de2118abe6d8997246240d646956ac855e9
-EBUILD storcli-1.23.02.ebuild 2358 BLAKE2B 6a124e14392bedf31f5408ce4b2bded73b8237f08391f40b1f8438ef8df31e38d5ea9e8cca99d8888e3f5e25dac309052c9a3896cb78dc270fa7bc74fcf482d6 SHA512 279aedf5aff9387e4dcad20172f253fa24b08b862f84dc9781b30da937ee5dd3f0c406bc769da91dd72f0914e017fb7df003f3951e9f42e3ca4a4fb523a47fb7
+DIST storcli-7.1211.zip 36988201 BLAKE2B 487dda0c78af60d96dc6eb8bc0c7074dd99719acc4faf10027430ea80a5d1cb76e6bdc9eaf0931967c5cdf10d80ee824f45118144bfc032a4ddce52d678df354 SHA512 f28ae41adf2286153ecd57f7d022940069356c9636e45aaae4ae45215487bbb8e3dea51fa4aa00b9e9340069036c1be21b186ce177e0fd0a6a0bb786cb58181f
+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
+EBUILD storcli-1.23.02.ebuild 2369 BLAKE2B cc6c04016d2fa087ef65d1d37796bf44e39f355bbd3a1c44f6f9e23a01425d0f541967575ddb47537781fd172f20eedfbea98009225594c14bea985dc70d6bf6 SHA512 c008d4329fb9d14a49f3cfe9025068a5d55b89747e61e8479e8c0fc2d18125ce8c49481b5563f025e7176d0609ba3ef68cd3c008f48c690eb379717db7cd2cde
 EBUILD storcli-7.0504.ebuild 2209 BLAKE2B fac3eb79205c9826a12fbd058bcff11233cfe76043c9872a8906f833bce749426c61e1cddfefafa40b98460d88ae1cc364145570462619a91e5756a15975418a SHA512 2a7a4b4491c145e2c2243414a075f401e5d22d057e6b5e9bc02bc1912cee390768a111aaf9678df77b84b653f2737a441f8bc4213403e20a2d7f8208ab42f54c
 EBUILD storcli-7.0606.ebuild 2486 BLAKE2B 0873b7c99026c2d3eee5c07bfa960c1b087ccbd2157809ab7682b41d198bd0752132752a4f528116587a0dab594bd55a574ddd20d8f341a7f7f30fe84229036e SHA512 8cefa565d87a6abe22d8290eadb1a675a2e4791a507f68ff56cd28857b31a15a409d91c550174b66e8ccc7e4de99d790894f32f1e2b73b525e8110a5d02298d1
 EBUILD storcli-7.0709-r1.ebuild 2345 BLAKE2B 3a03247560eceebed6c1413850607eb7c2b7f551668f2163745ba2c717450c72ccdaacea7bc328bf536a959b22b4e6478d718ba30b4b56ac6daaa34501fd0672 SHA512 e76b173a67d812f10dd21d5319ee1b9dfd20ba285005caeac9dac5b34a5f5306e0f64c5887dd7e852bdf838fd529c07bd2f3b5d593b8286502ae3bfe23596635
-EBUILD storcli-7.1017.ebuild 1810 BLAKE2B ac0928c466af3f0a87b333002c242ac82c6592b359e026c49690d734660a4a44b4fe5e34cb1b67696369c7d101f7f250da729cea9cd51750dcf39a423b29b740 SHA512 6006b68ae8fbf475909263b96a807942dfd686795bef2ff6e7e017a09766f7fc693715896c31d000cd0001a0ea7f6b4f797d4d2e13fccfe70cb583ab3755cd64
+EBUILD storcli-7.1017.ebuild 1806 BLAKE2B 31822ab31c50bbb0cf00bc126479888a1fd199a9304ab891f4c0dda0867c9f1e4aca7c62b484842e3bd84dee8ed57f7a1ef270b987fcc0156dc168d1ae033819 SHA512 abde801f76ff804ea33d14ab25b051743a9fe8d366b8663ad919e828fa4b10f6fd68c1b9e3b934b9c4447533657a689d5f324a09b9bae5424245fee5ec988b74
+EBUILD storcli-7.1211.ebuild 1824 BLAKE2B 2260a77fb615226590aace79de8fd7352fbf7c0afd8ed24b30999fc90ade59d7275590393f678c41669eb2762d36f1cdc250d9757ead0a62a4d97ec41eac8e51 SHA512 93a47858daf64746f80256a7f78a3b29673ff2dca4e8b473c61981339c776932eff20e4fef99af429d13a73fc6d890a7458466e11e741b6c7342c59417859122
 MISC metadata.xml 251 BLAKE2B fb85d245662fa1577cfe1d77526bd34fb2a674dd447192f2defe78b751423e3d14ae73efd3ac0e1e5e6fdb6259622a782e724ec77021faf526509f199dd20d61 SHA512 46942a98ef7e36470d1169a5bc8839d25603e33c143cd36327a8a85fc14cb6bfb32247eb7608d92cc58a06cc8eef5bd64d6ec2d21e69a88632e4b936598aa772
diff --git a/sys-block/storcli/storcli-1.19.04.ebuild b/sys-block/storcli/storcli-1.19.04.ebuild
index 7e731e74ad6f..71f8d26146b5 100644
--- a/sys-block/storcli/storcli-1.19.04.ebuild
+++ b/sys-block/storcli/storcli-1.19.04.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,7 @@ KEYWORDS="-* amd64 x86"
 IUSE=""
 
 RDEPEND=""
-DEPEND=""
+DEPEND="app-arch/unzip"
 
 DOCS=( readme.txt license.txt )
 
diff --git a/sys-block/storcli/storcli-1.20.15.ebuild b/sys-block/storcli/storcli-1.20.15.ebuild
index ee90410d73ad..42d4a8173fa0 100644
--- a/sys-block/storcli/storcli-1.20.15.ebuild
+++ b/sys-block/storcli/storcli-1.20.15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -16,7 +16,7 @@ KEYWORDS="-* amd64 x86"
 IUSE=""
 
 RDEPEND=""
-DEPEND=""
+DEPEND="app-arch/unzip"
 
 DOCS=( readme.txt license.txt )
 
diff --git a/sys-block/storcli/storcli-1.21.06.ebuild b/sys-block/storcli/storcli-1.21.06.ebuild
index bec8d6bb4290..e6bd5d0afeba 100644
--- a/sys-block/storcli/storcli-1.21.06.ebuild
+++ b/sys-block/storcli/storcli-1.21.06.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -21,7 +21,7 @@ KEYWORDS="-* amd64 x86"
 IUSE=""
 
 RDEPEND=""
-DEPEND=""
+DEPEND="app-arch/unzip"
 
 DOCS=( readme.txt license.txt )
 
diff --git a/sys-block/storcli/storcli-1.23.02.ebuild b/sys-block/storcli/storcli-1.23.02.ebuild
index 18d43904908b..0ca1b753f99e 100644
--- a/sys-block/storcli/storcli-1.23.02.ebuild
+++ b/sys-block/storcli/storcli-1.23.02.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -21,7 +21,7 @@ KEYWORDS="-* amd64 x86"
 IUSE=""
 
 RDEPEND=""
-DEPEND=""
+DEPEND="app-arch/unzip"
 
 DOCS=( readme.txt license.txt )
 
diff --git a/sys-block/storcli/storcli-7.1017.ebuild b/sys-block/storcli/storcli-7.1017.ebuild
index 7122690d293d..f6575ca54f0a 100644
--- a/sys-block/storcli/storcli-7.1017.ebuild
+++ b/sys-block/storcli/storcli-7.1017.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://docs.broadcom.com/docs-and-downloads/raid-controllers/raid-cont
 
 LICENSE="Avago LSI BSD"
 SLOT="0/7.10"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 IUSE=""
 
 RDEPEND=""
@@ -64,5 +64,5 @@ src_install() {
 
 	dosym "${MY_STORCLI_BASEDIR}"/storcli /usr/sbin/storcli
 
-	pax-mark m "${D%/}${MY_STORCLI_BASEDIR}"/storcli
+	pax-mark m "${D}${MY_STORCLI_BASEDIR}"/storcli
 }
diff --git a/sys-block/storcli/storcli-7.1211.ebuild b/sys-block/storcli/storcli-7.1211.ebuild
new file mode 100644
index 000000000000..d96942c7205d
--- /dev/null
+++ b/sys-block/storcli/storcli-7.1211.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit pax-utils
+
+# Upstream is still using strange version numbers
+MY_PV="007.1211.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.zip -> ${P}.zip"
+
+LICENSE="Avago LSI BSD"
+SLOT="0/7.12"
+KEYWORDS="-* ~amd64 ~x86"
+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}"
+
+	if use x86; then
+		doexe storcli
+	elif use amd64; then
+		# 32-bit version is less crashy than the 64bit (bug #656494)
+		newexe storcli storcli32
+		newexe storcli64 storcli
+	fi
+
+	dosym "${MY_STORCLI_BASEDIR}"/storcli /usr/sbin/storcli
+
+	pax-mark m "${D}${MY_STORCLI_BASEDIR}"/storcli
+}