gentoo resync : 29.05.2018

3 files changed, 82 insertions, 3 deletions

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
+}