6 files changed, 69 insertions, 6 deletions
diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz
index 9e4a7561c50f..6112c5868653 100644
--- a/sys-block/Manifest.gz
+++ b/sys-block/Manifest.gz
diff --git a/sys-block/storcli/Manifest b/sys-block/storcli/Manifest
index 6a29c588fcb6..0db4599ced15 100644
--- a/sys-block/storcli/Manifest
+++ b/sys-block/storcli/Manifest
@@ -12,7 +12,8 @@ DIST storcli-7.1211.zip 36988201 BLAKE2B 487dda0c78af60d96dc6eb8bc0c7074dd99719a
 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
-DIST storcli-7.1515.zip 35678755 BLAKE2B 9fb8da35be491afaea3a288b5c4c1ed0806fa9d6831e9a6dbf14d4c00469b1ce6e9d8fe9a98ce64505580420b5c145f002338d3029794af4c54779d9f324ec56 SHA512 43565cc695e9e7a7725474ab8091ea00de8fde7fabffe708c45e4c0e8713b1fcb1a5a25963bba44974b7787bebc06a59f3b8180416fefb0a54b4fd403c6152be
+DIST storcli-7.1613.zip 35016341 BLAKE2B 046651c696e5a20bcd0488c3cb495c7260e7665e3cb93052fce7fc79de019cb310ac7b1615f4ee4cc59a3bddcb81e548b82098a5ba051b1ba94f721115e95ff9 SHA512 5c90bce5502ec725a41c670438acd2e1eb07d21edba6e940f00f568f63a2e9e9095817eb50a4995d1ff8482a60ab77a633f01df0dc0a1abe7b767ce24b38b79b
+DIST storcli-7.1715.zip 40965278 BLAKE2B 044cf3e7b7bc9853ce7ff06050c59ceb877e88ffece2f6494561fcd416e00b41d033ff1ffe0e18b63e55edf2443296bdd3f817c09c48a0e0d69365d41cdd43fd SHA512 79dbd5f2ded4897a3d867bbab76d415b8532a647fc12f369f667e11e772b398954a2d762a011c37ab7a18b4759c3c1f8408d129ceb9b1ae62bce4671380eb988
 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
@@ -25,5 +26,6 @@ EBUILD storcli-7.1211.ebuild 1822 BLAKE2B eeedf7c5527b0e14c6eb0ae2c619e9d1d941f4
 EBUILD storcli-7.1316.ebuild 1822 BLAKE2B 3939bd238e40a3e41503efd7e5c8c87057b5b65511b985eff5530ffa661a445cb0818f870d5d64f18fd2b2f21dcf47365d225495146d4276b257f67a8cd05ac6 SHA512 b3661ca4af4e6308d1f87c0e8dff2b3b46b40df31f6fa7201fc80a3a4727fcdf39d7a7fb475674c41e3fd4d1a8ed5a2061a5328fe1ebd754141b7a079b6e7d10
 EBUILD storcli-7.1410.ebuild 1701 BLAKE2B 706ca8f5b08be1d5bbd552daa202ab419fe844b50d48336762c9131a69a6f4310a822d94d8a6ecebca8532f5f4dd19f3b89cf753687e268da437d5597741a999 SHA512 95501c39002179a6c2f81073c073dc28bb5fc9cad98580bb7cae9bcde286fa7e20644e1fc2df07f50ddcd9b52e8e12cf71ae0d555053f3e74f632111a6e62fee
 EBUILD storcli-7.1508.ebuild 1686 BLAKE2B 905183e8003dee1d7317633157662844b35ba85744a10671e1d60fc41a878d53d58f9d504f2cb67d3e16d29e3dcfd2dd4c9338ee743177b2b4d8c55674f92def SHA512 0382c253f4b98fde4d498523f7bf76b26cb18b05e8e2e2026274a3695eba91955514f1a1d2fc1a35fc75b75f8b79e04f9fa0ada9ab5d3089df79aaadd392334e
-EBUILD storcli-7.1515.ebuild 1686 BLAKE2B 905183e8003dee1d7317633157662844b35ba85744a10671e1d60fc41a878d53d58f9d504f2cb67d3e16d29e3dcfd2dd4c9338ee743177b2b4d8c55674f92def SHA512 0382c253f4b98fde4d498523f7bf76b26cb18b05e8e2e2026274a3695eba91955514f1a1d2fc1a35fc75b75f8b79e04f9fa0ada9ab5d3089df79aaadd392334e
+EBUILD storcli-7.1613.ebuild 1686 BLAKE2B 620c6f13830d7ef1470f1d6ef1f2f0d37528b3b64506283c4f5fd4bd575f6c6867d7b1a2b96befb34df8f666800f40c2cf91e75b13d4e2f92c9df287b977abeb SHA512 4eae2f7667481130727e8fdb13bbdc8e6df08eb10c2fc11453e5ffc597cea5c06b43a0a5fcea5d3d2eabe3fd189cff4394aa8495bdba77a821ce287b8db2861d
+EBUILD storcli-7.1715.ebuild 1686 BLAKE2B 840605886041ef5a01949bc69cb64eaab3de7025f77e6da7f8a49d5364b1308d3fcfb24c8e2b4768768b97ebf74dde7f8283664b10546aad19b6f2a0986185d4 SHA512 e2dd6f7a5e9f7841ba04a2eaaa99534c9d5aaf39ec2293a46f148cf0789e81668afb2b995600f29a84a889ac46ee8ef5d19e7e3c0bdce18499d0bb8cf7a334b5
 MISC metadata.xml 251 BLAKE2B fb85d245662fa1577cfe1d77526bd34fb2a674dd447192f2defe78b751423e3d14ae73efd3ac0e1e5e6fdb6259622a782e724ec77021faf526509f199dd20d61 SHA512 46942a98ef7e36470d1169a5bc8839d25603e33c143cd36327a8a85fc14cb6bfb32247eb7608d92cc58a06cc8eef5bd64d6ec2d21e69a88632e4b936598aa772
diff --git a/sys-block/storcli/storcli-7.1515.ebuild b/sys-block/storcli/storcli-7.1613.ebuild
index 85475aef40fd..e1d2ca5a4dda 100644
--- a/sys-block/storcli/storcli-7.1515.ebuild
+++ b/sys-block/storcli/storcli-7.1613.ebuild
@@ -6,14 +6,14 @@ EAPI="7"
 inherit pax-utils toolchain-funcs
 
 # Upstream is still using strange version numbers
-MY_PV="007.1508.0000.0000"
+MY_PV="007.1613.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"
+SLOT="0/7.16"
 KEYWORDS="-* amd64"
 IUSE=""
 
diff --git a/sys-block/storcli/storcli-7.1715.ebuild b/sys-block/storcli/storcli-7.1715.ebuild
new file mode 100644
index 000000000000..e406b517c510
--- /dev/null
+++ b/sys-block/storcli/storcli-7.1715.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2021 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.1715.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.16"
+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
+}
diff --git a/sys-block/thin-provisioning-tools/Manifest b/sys-block/thin-provisioning-tools/Manifest
index d51aa19b7263..3d44a8d80676 100644
--- a/sys-block/thin-provisioning-tools/Manifest
+++ b/sys-block/thin-provisioning-tools/Manifest
@@ -1,7 +1,7 @@
 AUX thin-provisioning-tools-0.7.0-build-fixes.patch 1077 BLAKE2B 540efcaff8a0f826f132aa06b5d63728d5b7e0de2da81ff65480537c10b4a769330f0e557496f1ce6116cce51b834057ffb6c967fb527deb419aee4d1f3d2ec5 SHA512 fbdf778774bca2e608bbab7696b6646c64ee740c40c743f40f28e7e360fc2a6c6c3752992d9d5f7bbb624a9240ba480a6e58a7c5956ba6d2b772ece18502afe7
 DIST thin-provisioning-tools-0.7.0.tar.gz 230595 BLAKE2B 00238a682f80600e3a5bb6d0d2a9662bd0fd3ae5404d5895427f169640b469780f554c22c6a93187058e6399c76ba14a6fa8d73f2bb09aa79927dd458b58ffa9 SHA512 cb6c44c7215aadd72292d73e2374d8c0c28566adcb10c7a3de83576dbd28649ebba6e2cc59945a28921e423540969cb21f648c37e375d68f48e56a8be4a4c7b8
 DIST thin-provisioning-tools-0.9.0.tar.gz 500998 BLAKE2B ac269fb6dfd1baf1572da27582ac2cd763b07aaac130a9467d05581e7a0ba1309d7dbf4c6095407111667e57af2e8183318d558ed23853f9c84b9c151c0878d9 SHA512 e1796fb3948847d72ca8247cae58017507c0a847a00201b93668eeb8fbfea4107c4c2affa5c211c149798a89b10474e83d2bd61a5545a668299be97aed591e0f
-EBUILD thin-provisioning-tools-0.7.0.ebuild 1288 BLAKE2B 1361f119e7c18515ea6bc034075a8cd4ad5c026b4911906acc6fd2c60906e076be05b918f1552ec92890ae09b3b48be20115ac8f2631896a2e6a96f057fdcb2f SHA512 e1c199e78b0101e3941a9d3917b4d263622001672c7e5051ca60d67932e6c1bed2a1e5cda46a81c529eb802c59b30fa14c09a1cf86dc7bdd57dcef779762b9fc
+EBUILD thin-provisioning-tools-0.7.0.ebuild 1288 BLAKE2B fe429bd318ab608b2161086cff3015440fd1feeaa21c03fe86c330a1045ab3c9a6efbddb6a5d414faa31757b81643299608b77fad174be8a1560523d6c8e857d SHA512 75e81c6096febf78c05d6cf9c7b9e1fb12975f5685742cd9ae48b4311343041e7af48325e6b13224c854b78882f879ede476fc915215a574d21872d846cc829e
 EBUILD thin-provisioning-tools-0.9.0.ebuild 1520 BLAKE2B 142a5de27b2f3facd64f99f6e0c48d70630c05e67cb700d70666f39b20d80ef09e4e8c12d3b541c3caddc3b0e74a699969832a51992b95be62421f70f9d0de30 SHA512 1f74065a127b83acf12fb2bd7c197374153e93519aaa3e106abe5c5ec94a0b9fe45db509a0dd33f149e53b6f2efe08d6a4e261d21c35810c90f3ad3cded6cf65
 EBUILD thin-provisioning-tools-9999.ebuild 1523 BLAKE2B 8b969392d3686af5df169d3bf1d968c89a273c59c63b668754c7ef6a0469d1a0cdb7882b3c32b7dbbaabe2e45cce7e58651af612e481cf694eff4d7bcd74401c SHA512 2ee4796124ffdc043f31e104431feed55b55f19f06525d3c9b1c66a15c89f2d0cc16316d0d5fae10008f33d91ab1c45d350a17a6a4666235136190342e8a0074
 MISC metadata.xml 434 BLAKE2B ce8a3b7440aa5f690989729e202c836ff63833f449e5b302dd58db3b43107b698a5480d761310964ba143b665729ca6ab23417df6eda7f13f24df55427cafb7f SHA512 5a7275bd03045f680a2942a7da2685d4ad94ae1995a612e80c9b6fd4ec8530ad536592247d2e1f4162e49469b9c6139f8237de9d80cae9f339b5852042eab22d
diff --git a/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.7.0.ebuild b/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.7.0.ebuild
index 8e318177d327..53bf5146d42e 100644
--- a/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.7.0.ebuild
+++ b/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.7.0.ebuild
@@ -21,7 +21,7 @@ RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
 DEPEND="${RDEPEND}
 	static? ( ${LIB_DEPEND} )
 	test? (
-		dev-lang/ruby:2.5
+		dev-lang/ruby:2.6
 		>=dev-cpp/gtest-1.8.0
 		dev-util/cucumber
 		dev-util/aruba