8 files changed, 91 insertions, 12 deletions
diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz
index 4b59fc590220..50ea625ab049 100644
--- a/sys-block/Manifest.gz
+++ b/sys-block/Manifest.gz
diff --git a/sys-block/megacli/Manifest b/sys-block/megacli/Manifest
index b03f78571071..380060f21621 100644
--- a/sys-block/megacli/Manifest
+++ b/sys-block/megacli/Manifest
@@ -2,7 +2,7 @@ AUX megacli-wrapper 102 BLAKE2B 15b4c1bcc7102e7c757527e4f8fbb30b4d6eb14773da3690
 DIST 8-07-14_MegaCLI.zip 7939395 BLAKE2B 3b4151724fab8b9fd2a5797d11919c52cdd5c96fefb6074fad6637a9a82a6d9291dd43e5480669779dbce18f3cb0c56fe119e868a6d6a7c9d05779eb6fccb154 SHA512 ee2b66b69dc41bb678e54f5ccf4908a51e6fde147b2118844ff6248127aa51f12af0e7562c74461d52ea8e9b4345877b21c87fc89210208d80cf2fd3402a93e3
 DIST 8.07.10_MegaCLI_Linux.zip 1543709 BLAKE2B 6b42195d105faa5ce6469d6a36c37a1d84b9a814bbc0e85ba45d8d29914232868db40fef0572c281a2716041e98222923547d7c7f25a71217bd4468ac3031fbd SHA512 ee83910dac54b653f5c33703555c51d37b33e1672c6de6473950ca21ff19518b7de921cfa07a50e1c7f26054c7075c6bc241b52f89757cc1e0e0f4251a07bcd7
 DIST 8.07.14_MegaCLI.zip 7939395 BLAKE2B 3b4151724fab8b9fd2a5797d11919c52cdd5c96fefb6074fad6637a9a82a6d9291dd43e5480669779dbce18f3cb0c56fe119e868a6d6a7c9d05779eb6fccb154 SHA512 ee2b66b69dc41bb678e54f5ccf4908a51e6fde147b2118844ff6248127aa51f12af0e7562c74461d52ea8e9b4345877b21c87fc89210208d80cf2fd3402a93e3
-EBUILD megacli-8.07.10.ebuild 2079 BLAKE2B 253392be248923c44d2976bf20613371fb62abe288aad803dc95ae66c0b91dd92f91d50524ee96d50e27fe571fdf2c817b30f729f948ecd154e478dd950ae435 SHA512 bd78ba3d2884a1b34f41decadba4dbfb1c987801f3195adafe6e4c79617987a608d63a6873fb799a58b12a326f4bc237583b56e4855c1a53e6c0b62d95d97d20
-EBUILD megacli-8.07.14-r1.ebuild 2501 BLAKE2B 0cecafa358d4cfe2e158549b345e4e22d35a9efa2c478aade8ad88e080153f910532088cce1584a588b43167391bad6a14ee6be6160207b8612004cc4f9b21c7 SHA512 f45b645ddd611917337688277c917c92032c81607d0a0bdeb8c197b4b1ed53403af1eb49d8b0ef72487311a0b5c641b53043ae1cca8e277bb42e9e8bd6b474a5
-EBUILD megacli-8.07.14.ebuild 2039 BLAKE2B a4e3718f206ee882cdcf2bbd24d9bc73963d18639cbef4345e2f6f6f36cb7df98c71ecfef008aca89e3ed1d7fdb476fc214f7efe7d8370591b2e6bac9161ebf2 SHA512 eb008a26eeba00b43230842c6e7a992a3d9237b09578d63ab012985349598346220655be44a80f7f901ca5241ea5732e4bd0c648153c21b55179f31e607d0a4f
+EBUILD megacli-8.07.10.ebuild 2077 BLAKE2B 4f3f81d17e7b83540c681af03461cfd4288ee5c3574781038b96eb69a7ba2b91699a749b69323501fcb23a4c163d361acd95abd44d5c05688db67d51dd61c54b SHA512 52e968c62bdb255a9250c2e1ba1f1f0021a122193c18ffaa797220ba0dbc2e39fc4c473f4b4476cbb8a7f7efc2a173c03678c7b2a1be84985e16bac54fa967a6
+EBUILD megacli-8.07.14-r1.ebuild 2499 BLAKE2B 42e2157a16393f99aa0d4869a50b922ebcdf9f36076d6d43b6754ea18a38de5f5ae3725459c417e14860f6066de9f2e76d3bcb02c92f153dd15ae95415bf2da6 SHA512 094cca6b06b46c701dd186c2cf5c8f4395ad0d63c0a955e2eb7f04d118ff2c43be2371d36af20b1bbe8dbb8c9199ed7d28d24f594f9d476d580e9cbf302d285e
+EBUILD megacli-8.07.14.ebuild 2037 BLAKE2B 06a8c94b147ff47ef20fef2e6756b5fede9d5045e226b8d1b27c360616f48ddfdbfbd6edba4436d7f221d4c75039d0312a81ca5dc7b497b2511cd382dc7ceafa SHA512 fb77f5df60fa5b07328c0d21639eef2258611c4f13e0ff9bc4e2c113e5896db5ddb0c8c3a0896f700137ba976a6b928e473c3426bdb9840ec35eb3788aa422a1
 MISC metadata.xml 318 BLAKE2B 98c2744d890564a2aee5a9541954654e57d97c3a30ca9d2470afb2d0d63935eadf02d7745b617bb9f0d076bc449ed5f10fbf4610226d3f701077d6e4c3929ab9 SHA512 d2c34bba25ecc086ba1e3e009fbcf56d40efa3522cbc8d1fd4e273a58d21d82c2fd159c25e9295939f713e1ed845d361645915060fef9bc71be9be3d4ef043ee
diff --git a/sys-block/megacli/megacli-8.07.10.ebuild b/sys-block/megacli/megacli-8.07.10.ebuild
index f822d8763e9e..b8d98d13d67e 100644
--- a/sys-block/megacli/megacli-8.07.10.ebuild
+++ b/sys-block/megacli/megacli-8.07.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -19,7 +19,7 @@ IUSE=""
 
 DEPEND="app-arch/unzip
 	app-admin/chrpath"
-RDEPEND="=sys-libs/ncurses-5*"
+RDEPEND="sys-libs/ncurses:5"
 
 S=${WORKDIR}/${MY_P}
 
diff --git a/sys-block/megacli/megacli-8.07.14-r1.ebuild b/sys-block/megacli/megacli-8.07.14-r1.ebuild
index 5092c2b2b775..92d6aa9dc7d3 100644
--- a/sys-block/megacli/megacli-8.07.14-r1.ebuild
+++ b/sys-block/megacli/megacli-8.07.14-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -22,7 +22,7 @@ IUSE=""
 
 DEPEND="app-arch/unzip
 	app-admin/chrpath"
-RDEPEND="=sys-libs/ncurses-5*"
+RDEPEND="sys-libs/ncurses:5"
 
 S=${WORKDIR}
 
diff --git a/sys-block/megacli/megacli-8.07.14.ebuild b/sys-block/megacli/megacli-8.07.14.ebuild
index fe24a5d5c170..b1b11afc3a9d 100644
--- a/sys-block/megacli/megacli-8.07.14.ebuild
+++ b/sys-block/megacli/megacli-8.07.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -19,7 +19,7 @@ IUSE=""
 
 DEPEND="app-arch/unzip
 	app-admin/chrpath"
-RDEPEND="=sys-libs/ncurses-5*"
+RDEPEND="sys-libs/ncurses:5"
 
 S=${WORKDIR}
 
diff --git a/sys-block/storcli/Manifest b/sys-block/storcli/Manifest
index 8fce531e0279..f06349307ea4 100644
--- a/sys-block/storcli/Manifest
+++ b/sys-block/storcli/Manifest
@@ -4,8 +4,10 @@ DIST storcli-1.21.06.zip 48578520 BLAKE2B e7bdfacbe7eba21b314a7aa4a61224c3363c95
 DIST storcli-1.21.06_readme.txt 199925 BLAKE2B 08b7ddc9d6a0ee176e91938d00ef12b39c764d0248f82d0d037050058088ea20f0356a7efc4d9de50c57fa685b32036d18c1eb8dcf4e7ffb85cd0b02b21c8abb SHA512 78524212b5d95bd62ef692bb715f6ae977811fd5522498915a4dbbd74a5d783d176fe318c0a0b7aad1b23419c78d205267f19b55790519dcc6d7e1d873498bad
 DIST storcli-1.23.02.zip 48778476 BLAKE2B 9eded7793e822785dfbd15b6a6fa70e70dc1f4e32df9e6e1e213420a4e6ae01705096ce8f0ea468a6dc8d5d22097c87e06e54be6fcccb9eaf6cc321c26b69b0a SHA512 2018c8b40d7371077f01bbe586ed1135d683823b9d243fde14d45404c8bab8328f36e19ac91eb876666a174a7cce7e95a2a75485f70681460cda4c9b65d4d579
 DIST storcli-1.23.02_readme.txt 201906 BLAKE2B 6dde1f7609d51f3d0b2feec9301a57472e92086fc7f1aecad3b455b03b571fb75e23de75d508c40b78ebab357340d8c14f5529fce3ce9ee6b513f5e80d82ad99 SHA512 9eefe69aee1a65339d2360759ba574f632a21bd3d13ba9d4cb0a86980e652addf5f7d2b650588f659caaa8ee302c48bc27b9f3ad7455e65d34dbcff0a8188e03
+DIST storcli-7.0504.zip 40558670 BLAKE2B 3cd54b47b42e5bb8329ccd4b09a6c0863347a04b276fa5dc11acf10ac1124c25b5f60e4171de96c1b8975bfae4cc7408554de933ba8fd5547fbd6e9395710ce8 SHA512 1c5c248a1c19eda5974415a7e1cc10c83bfad0d6e37adbd01ae624316fc1d60628503655c4dd0005a14c79c570177664ea9cdb7330b97daf19808a9513b1311a
 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 2360 BLAKE2B 1c4737830edff69c11d4cee44e1edef7a2d55c43a0dc94c26aaa992de879a0f719dcbe9bc90ddfff9891b21a86e42ff14290c10231a92403bae56567adc1e7c3 SHA512 3a26ba5f46cefb18ae8f5cbc030191176096a6b9a43b0155e0842411311302f72a623cc498f94e957934dfb17a6bdc25ac5c8e434ca66c4c4ff63058575282ae
+EBUILD storcli-1.23.02.ebuild 2358 BLAKE2B 6a124e14392bedf31f5408ce4b2bded73b8237f08391f40b1f8438ef8df31e38d5ea9e8cca99d8888e3f5e25dac309052c9a3896cb78dc270fa7bc74fcf482d6 SHA512 279aedf5aff9387e4dcad20172f253fa24b08b862f84dc9781b30da937ee5dd3f0c406bc769da91dd72f0914e017fb7df003f3951e9f42e3ca4a4fb523a47fb7
+EBUILD storcli-7.0504.ebuild 2200 BLAKE2B 8ab87a29e96ea30e9400d666e42dc5f7c405f062af91f2571b40aca8dc43060526ec386240acf02933a0287a0404b26ab410f9af0c0a89593087abeb142c9e53 SHA512 622cb0efe07e9d4e953220a8029eb6e95698c868151e6c907acd2c458ca61c37f5a6086d7b21c3fdf677c22d9bd72300fb2fd577087ab9542b84be9f6204e76c
 MISC metadata.xml 251 BLAKE2B fb85d245662fa1577cfe1d77526bd34fb2a674dd447192f2defe78b751423e3d14ae73efd3ac0e1e5e6fdb6259622a782e724ec77021faf526509f199dd20d61 SHA512 46942a98ef7e36470d1169a5bc8839d25603e33c143cd36327a8a85fc14cb6bfb32247eb7608d92cc58a06cc8eef5bd64d6ec2d21e69a88632e4b936598aa772
diff --git a/sys-block/storcli/storcli-1.23.02.ebuild b/sys-block/storcli/storcli-1.23.02.ebuild
index 5d1cf5644ce1..18d43904908b 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-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -17,7 +17,7 @@ SRC_URI="https://docs.broadcom.com/docs-and-downloads/raid-controllers/raid-cont
 
 LICENSE="Avago LSI BSD"
 SLOT="0/6.14"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/sys-block/storcli/storcli-7.0504.ebuild b/sys-block/storcli/storcli-7.0504.ebuild
new file mode 100644
index 000000000000..8201ffda1b9e
--- /dev/null
+++ b/sys-block/storcli/storcli-7.0504.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit pax-utils
+
+# Upstream is still using strange version numbers
+MY_PV="007.0504.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/docs-and-downloads/raid-controllers/raid-controllers-common-files/${MY_PV}_Unified_StorCLI.zip -> ${P}.zip"
+
+LICENSE="Avago LSI BSD"
+SLOT="0/7.5"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND=""
+
+DOCS=( readme.txt license.txt )
+
+MY_STORCLI_BASEDIR="/opt/lsi/storcli"
+
+QA_PRESTRIPPED="${MY_STORCLI_BASEDIR:1}/storcli"
+
+src_unpack() {
+	local _src_file
+
+	for _src_file in ${A}; do
+		if [[ ${_src_file} == *.txt ]]; then
+			cp "${DISTDIR}/${_src_file}" "${WORKDIR}" || die "Failed to copy '${_src_file}' to '${WORKDIR}'!"
+		else
+			unpack ${_src_file}
+		fi
+	done
+
+	unpack "${WORKDIR}"/Unified_storcli_all_os.zip
+
+	mv Unified_storcli_all_os/Ubuntu/storcli_*.deb "${WORKDIR}" || die "Failed to move storcli_*.deb"
+
+	# 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.gz
+
+	mkdir "${S}" || die "Failed to create '${S}'"
+}
+
+src_prepare() {
+	default
+
+	# Create clean $S
+	mv "${WORKDIR}"/*_StorCLI.txt "${S}"/readme.txt || die "Failed to move *StorCLI.txt to readme.txt"
+	mv "${WORKDIR}"/Unified_storcli_all_os/Linux/license.txt "${S}"/license.txt || die "Failed to move Linux/license.txt"
+	rm -rf "${WORKDIR}"/Unified_stor* || die "Failed to cleanup Unified_storcli* dirs/files"
+	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
+		newexe storcli64 storcli
+	fi
+
+	dosym "${MY_STORCLI_BASEDIR}"/storcli /usr/sbin/storcli
+
+	dodoc "${DOCS[@]}"
+
+	pax-mark m "${D%/}${MY_STORCLI_BASEDIR}"/storcli
+}