gentoo resync : 20.06.2021

9 files changed, 141 insertions, 6 deletions

diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz
index 657470cf32f2..8e0557dbdd8d 100644
--- a/sys-block/Manifest.gz
+++ b/sys-block/Manifest.gz
diff --git a/sys-block/scsirastools/Manifest b/sys-block/scsirastools/Manifest
index c95cea7c68ed..aee0f2dd99c0 100644
--- a/sys-block/scsirastools/Manifest
+++ b/sys-block/scsirastools/Manifest
@@ -2,6 +2,6 @@ AUX scsirastools-1.5.6-glibc-2.10.patch 3881 BLAKE2B b7d299574f359a9066ad01dc9d0
 AUX scsirastools-1.5.7-sysmacros.patch 634 BLAKE2B 5ce1302984c649b5a378bf8af1be1223c606234d337f2c979564d288948029db69b0fea49dc746d58fe26a9ae4f6e14c0c3044c5c8121e816cac012bde31e4b3 SHA512 2339c57d3b50b80bdc17a1177403a109e7d377ecf4231c63e88a34abed5c9cc0336b5495e972077c6a4c32cf517e0c15bd7bf1982204ea1a89e25b4d03d0eac4
 DIST scsirastools-1.5.7.tar.gz 677348 BLAKE2B f94134fc9e4c17d794a77e42143d620fb8096e2cc64e66fa290563921fa625a322f823ba9f88c17547eb5f03e0a6caf14e106e9d0499afd301e6961fead0345c SHA512 399d366216b5f24ef67086b2e5713a259435293219e22166530a6b92a45519b677bd980906691d2166f1fa6b6ee873568b143df32cfed6a5500066ea914b12f2
 DIST scsirastools-1.6.4.tar.gz 659203 BLAKE2B d041d64662d13165baa1f182e765334ff9027325c90ae92557a48d1edbcba8e96376f0bd5fa1a9952557c74f1c0acad52aff415207c114df44459f1ad99f9da2 SHA512 a0331557eb9c535b3bf33a95994d957505873bc1b39ee240846161a79d7e1f7ed494b23678e23931e917014cf7ebb6a0dd81e5f62089db06e03cf138db06a0fa
-EBUILD scsirastools-1.5.7.ebuild 1396 BLAKE2B 53fa2e3c38e0a1976ae1a6c6b8b101cff43e434e1a57d301aef7dc9d82853bdba9dd5b6728ff728dffd492a4f29a083da4ef9c7a9f117a241805f3c6278e4a5d SHA512 e2b05317091d0393c49a4a21f286a963cc78d53f2d9219d8a6aaacbb2d548240905b10aafc3d35bd79ad9a1bd38a503644424d6a20cac158a0ca66af377f77c6
-EBUILD scsirastools-1.6.4.ebuild 1315 BLAKE2B e37811324d59e15dc1f334a914ff9009b19b12d408ccdc3a7eeb039cba38806a7b7e9c3540c07e54d5cf782bda25083ad4abd563d24f21f7d1ab571f85f3bd2e SHA512 47a5ceaacf58bc1ac92370acdb462ac36605327d8a1ce259bf09e4c9c3e9b9ba960f0e211472cde64f097343e164955401e7d8d5ef86a9dd285f95aafabf6df8
+EBUILD scsirastools-1.5.7-r1.ebuild 1377 BLAKE2B e46570da59a9e5b235322884f7629ee88480db81111d24542b71c1899bdfdb5013699dc0d8742e4f03730cab803f87a06cc7fd785bbfdeb082b452ec85df114a SHA512 4f0d8451e645a8c8e6d3bc745a7b57bce67ed90c6878ef7f7da727f7ba46abb94d82a1427737023e12fcfa498fe48323c9b170ffb8df9b93a11c87306dda0ff1
+EBUILD scsirastools-1.6.4-r1.ebuild 1296 BLAKE2B f6cf494b286b853989854c1e701d95d96d69df4d8ae8b09e8c9fb88900a12fd0d68868fa76cef827c98cfc696c9bfbec1d6bda717675d056aec3baa37d58f7f8 SHA512 5568b8f55c2eeccce1268dc5cd390cf645e082a7ad1993e8b7a2f1fbbe3864cfb55d36a8ebcd56a80bee9ac1a53247547cc68bb25978c10dedc49580ce5cbcf0
 MISC metadata.xml 308 BLAKE2B d665d3bdace3f2188682eb5a475fce26b12ba6178427fe3b5ee1d7dd262c9200ebf53e49bd7d6bb62863522fad78b2544df66bb33e9c52adc572361c19c2a10a SHA512 a3c71ac01e9d03b79330f35c039bd12270f956c68abdd92edbd909ff212389447cb8b51ab69df71ebcc27b047089fd7d34613808699fad95dc6e8a7fe2d86df8
diff --git a/sys-block/scsirastools/scsirastools-1.5.7.ebuild b/sys-block/scsirastools/scsirastools-1.5.7-r1.ebuild
index 935678ed2250..6fab3675a2ee 100644
--- a/sys-block/scsirastools/scsirastools-1.5.7.ebuild
+++ b/sys-block/scsirastools/scsirastools-1.5.7-r1.ebuild
@@ -14,8 +14,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
-RDEPEND="sys-apps/rescan-scsi-bus
-	sys-apps/sg3_utils"
+RDEPEND=">=sys-apps/sg3_utils-1.44"
 DEPEND="${RDEPEND}"
 
 src_prepare() {
diff --git a/sys-block/scsirastools/scsirastools-1.6.4.ebuild b/sys-block/scsirastools/scsirastools-1.6.4-r1.ebuild
index 9f2bb3b436b0..a0fd6aa0e5f1 100644
--- a/sys-block/scsirastools/scsirastools-1.6.4.ebuild
+++ b/sys-block/scsirastools/scsirastools-1.6.4-r1.ebuild
@@ -14,8 +14,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
-RDEPEND="sys-apps/rescan-scsi-bus
-	sys-apps/sg3_utils"
+RDEPEND=">=sys-apps/sg3_utils-1.44"
 DEPEND="${RDEPEND}"
 
 src_prepare() {
diff --git a/sys-block/storcli/Manifest b/sys-block/storcli/Manifest
index 6e2bfb189824..6a29c588fcb6 100644
--- a/sys-block/storcli/Manifest
+++ b/sys-block/storcli/Manifest
@@ -12,6 +12,7 @@ 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
 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
@@ -24,4 +25,5 @@ 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
 MISC metadata.xml 251 BLAKE2B fb85d245662fa1577cfe1d77526bd34fb2a674dd447192f2defe78b751423e3d14ae73efd3ac0e1e5e6fdb6259622a782e724ec77021faf526509f199dd20d61 SHA512 46942a98ef7e36470d1169a5bc8839d25603e33c143cd36327a8a85fc14cb6bfb32247eb7608d92cc58a06cc8eef5bd64d6ec2d21e69a88632e4b936598aa772
diff --git a/sys-block/storcli/storcli-7.1515.ebuild b/sys-block/storcli/storcli-7.1515.ebuild
new file mode 100644
index 000000000000..85475aef40fd
--- /dev/null
+++ b/sys-block/storcli/storcli-7.1515.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.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
+}
diff --git a/sys-block/vblade/Manifest b/sys-block/vblade/Manifest
index 275187f7ed1a..8b6cf24cc33e 100644
--- a/sys-block/vblade/Manifest
+++ b/sys-block/vblade/Manifest
@@ -2,7 +2,10 @@ AUX conf.d-vblade 817 BLAKE2B befac1b206fa3442c5e820baff8efdf4cff443b449ae23679d
 AUX init.d-vblade.vblade0-r2 2909 BLAKE2B cf70ce62776c6e79c75110d4622c2913090221d336cea7674a9ba87bd4fb3ea3d7bf5e374d1b9b00693bf864573fef04de11a1b13acc8eb2087811d7fafe9a39 SHA512 1250bdefad4a6abe107d9ceb296b26204c0c9731a963a5a595e799cf2ac3eb10a2d2f48335baf55fa54d220da476e0013b4cd641d35686250794b48e81912403
 AUX vblade-24-fno-common.patch 1105 BLAKE2B 1b6391626e8ca092705f3fdc35072b925d6ea0b10538fedee93e19d6f3ec6347c23b9e63a208c84fed0a09da5a3b3a36eec9ccf933772cd1fb29708c54273249 SHA512 867e31d46ce3f9633262436fca673be485045766f745ebd0607d5632213dafe17259d9f38a55a094c6dc5139d625be1855d01830c755a14c33abe34b57698db9
 AUX vblade-24-makefile.patch 885 BLAKE2B 875811dfa1a75dc1f0fd809d3fc7a72ec1908b4e4d610f1e0a7d4e5813ac4c33d44a19277867c149b3103d267391a6451be98199170cd900e7fb91036d847d66 SHA512 0e7a37fe76be875dbb28337fae91aff31e6d652b112fc255cf6f8e2c22070ad6bb5dc486719af753224ea6c6a72a647e198ab8d2a0930c38ccba46a19ffa6155
+AUX vblade-25-makefile.patch 889 BLAKE2B a225637b1afdb920ebadcb9e3842b607dae9956d28c55edc58cb46263cb87e91e6ad0568e8276b66c8bb1a5d2d5bbca10bc35139b43d7bd84a3c2acb6f733856 SHA512 b76cbf984e6d91ce73a0ff1984442783dc47ea02508816cb0100f472df4527f2947999e623f9e1e3461c65df89ab29b3c4da0cb2f01eae770b01c13f604e4819
 AUX vbladed 544 BLAKE2B 88badea5aad70934eb16731ea2ce93762d282193b43efd25f71b3fc2a69eb3825bcf3db9cc243fb58f38874d2c6c13ab8368817c489bd27581101ad6c1a7c908 SHA512 447dbec563f41848727fe72ff391c07136509acbb707cf427485ef9ad190ec4247d809a2d71136e8f5456cf4f1798b89c9ca4ddcc4407f71d63ad220dab37c30
 DIST vblade-24.tar.gz 27638 BLAKE2B 8a99d571b3b97d47ce9c81ef8141e0d6477181e88aa56e3ea7d03c689c747a60922c21969ea009cf978a3cb15bcb969b12df50f2bd8e6bb498a8bc6d483be1d3 SHA512 d5db85581db119b83a129fc00635d37b6d8fccfaf685dc58c68773c7299f7fe4e01735ec7fea6a0494a0cf2bc1400d643a720b55e4d6de37a0b8ec15d00d1f2a
+DIST vblade-25.tar.gz 32524 BLAKE2B 5bc396e5f47fa293968b58d589a9f8c5c837434abcc93be5f859047b25a5c6d3e3ecce8119f536fda222574b5b1d598a009f4ae393075c597c3f0f1f1f7ea79c SHA512 a70ee7e98a71bc2a649501c92e6c37fc0410837f5f68f9501e75b688743f0bbe2d1f93969b3a9fe068247cd49c209ba72f794dcbb68ee9d955c0f7fad774fd92
 EBUILD vblade-24.ebuild 753 BLAKE2B c0fe8a2e3502fc9bbe6a02cca82628a9fe45f4117e0600e4c9bf32b3e1d32da5aeaeb188f8dc26976c617b11736b0be715c852898974c55c48755c82385ef789 SHA512 15723fc9dd17495dc7d1d7fc999f745d075e9aff25a15767f0a8219ca7d66b34ed574a25ac2b939e0221e1c6c5b05b17f584c5d260f0e1dc520601001957fcc2
+EBUILD vblade-25.ebuild 724 BLAKE2B ca43f9197fdb238f4c5904527c2412ab15fe36a091fb2e015ce7530877a6e954ac315c0407eb65534aaf9bfa69a58a073ae1a57e473441e857b62de0b5b18da5 SHA512 e72af6d4a2cd4a9349f6b17473f4828afbe3b06b2ab03ac334170ad17f5d54d157bc1f5dd05b3ecc13cb715da40a2c0acba26cd4b955242928987c1539c2d3f1
 MISC metadata.xml 328 BLAKE2B b04b8d9c3016fc84883de505bb4b5fa0dd0f97d8a07c1e84995b7b2931f6b356cfb0f59b7665f7a9c63955a3ee7bae5d37379a326eafe20d58840bd236562718 SHA512 5f04425d524c4535b0b3b42a2c310afa42f09649929f08e12bb491ae808f2fb8dbd08e3c153426bdcef328291b9b19feea2c557ef0a2c6e3a98fc69824c11ca5
diff --git a/sys-block/vblade/files/vblade-25-makefile.patch b/sys-block/vblade/files/vblade-25-makefile.patch
new file mode 100644
index 000000000000..072c963b1c39
--- /dev/null
+++ b/sys-block/vblade/files/vblade-25-makefile.patch
@@ -0,0 +1,36 @@
+--- a/makefile
++++ b/makefile
+@@ -9,29 +9,23 @@ sharedir = ${prefix}/share
+ mandir = ${sharedir}/man
+ 
+ O=aoe.o bpf.o ${PLATFORM}.o ata.o dat.o
+-CFLAGS += -Wall -g -O2 -fno-common
+-CC = gcc
++CFLAGS += -Wall
+ 
+ vblade: $O
+-	${CC} -o vblade $O
++	${CC} ${LDFLAGS} -o vblade $O ${LIBS}
+ 
+ aoe.o : aoe.c config.h dat.h fns.h makefile
+-	${CC} ${CFLAGS} -c $<
+ 
+ ${PLATFORM}.o : ${PLATFORM}.c config.h dat.h fns.h makefile
+-	${CC} ${CFLAGS} -c $<
+ 
+ ata.o : ata.c config.h dat.h fns.h makefile
+-	${CC} ${CFLAGS} -c $<
+ 
+ bpf.o : bpf.c
+-	${CC} ${CFLAGS} -c $<
+ 
+ dat.o : dat.c
+-	${CC} ${CFLAGS} -c $<
+ 
+ config.h : config/config.h.in makefile
+-	@if ${CC} ${CFLAGS} config/u64.c > /dev/null 2>&1; then \
++	@if ${CC} ${CFLAGS} ${CPPFLAGS} config/u64.c > /dev/null 2>&1; then \
+ 	  sh -xc "cp config/config.h.in config.h"; \
+ 	else \
+ 	  sh -xc "sed 's!^//u64 !!' config/config.h.in > config.h"; \
+ 
diff --git a/sys-block/vblade/vblade-25.ebuild b/sys-block/vblade/vblade-25.ebuild
new file mode 100644
index 000000000000..040f3e71f420
--- /dev/null
+++ b/sys-block/vblade/vblade-25.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="vblade exports a block device using AoE"
+HOMEPAGE="https://github.com/OpenAoE/vblade"
+SRC_URI="https://github.com/OpenAoE/${PN}/archive/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="sys-apps/util-linux"
+
+S="${WORKDIR}/${PN}-${P}"
+
+PATCHES=( "${FILESDIR}"/vblade-25-makefile.patch )
+
+src_configure() {
+	tc-export CC
+}
+
+src_install() {
+	dosbin vblade
+	dosbin "${FILESDIR}"/vbladed
+
+	doman vblade.8
+	dodoc HACKING NEWS README
+
+	newconfd "${FILESDIR}"/conf.d-vblade vblade
+	newinitd "${FILESDIR}"/init.d-vblade.vblade0-r2 vblade.vblade0
+}