gentoo resync : 02.08.2019

15 files changed, 151 insertions, 121 deletions

diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz
index 74d2473f3530..c7e6f9b95cd8 100644
--- a/sys-block/Manifest.gz
+++ b/sys-block/Manifest.gz
diff --git a/sys-block/arcconf/Manifest b/sys-block/arcconf/Manifest
index 204cd969f5e6..f1edfab78beb 100644
--- a/sys-block/arcconf/Manifest
+++ b/sys-block/arcconf/Manifest
@@ -1,7 +1,5 @@
 DIST arcconf_v2_01_22270.zip 47168976 BLAKE2B 95693a1408e5a4d0d638bbf265f2e1e64247dfec2b1078b56860c5fcd4b13ffa5967bfb9967abfd4b79c788aaeb20759b3a9070a84b083c1653e4868a96ac4cf SHA512 0f91a697c44ea0c0561bec9e432e7d4eba8eb8a2b0255a9867bdb183f81e745aee1dcc2b0017847803dbb27f55cad3e985f4bcd3a202c52f5b557fb724e94d9e
-DIST arcconf_v2_06_23168_h.zip 76933066 BLAKE2B a0bad8832bfc9a1d48de8738764dbf30148f344a855679c220ee40426bfee0b83c2ed82fd4c8ae32bc81df90c9c762c5a9ed0ee3466501eb60b605ea2e446c15 SHA512 668261fa6224a7d1bc18ddbf0d4610ee218f23217bfc600be6b3fe5c2fda929e43168d98120aa4942ae4e40a853fcc988e027ba90357f6e6f7960756e1e202dd
 DIST arcconf_v3_01_23531.zip 76188493 BLAKE2B bb939262e89a76fe28cca60ce647df53bd66625d8273cf80ad0b9daa31de8ac33d181a5ad864e52ce5b599d9631a503d2e4a132ec3369b67f0e12887a4bccc0c SHA512 93ab1b5f3f35ad403ac52456ffb16b5b57c4851dbaa3d4922194b29b72957944a0a3e02346362f62b3f6ba5f73394a3720a1f5a371b34e9a03f31bd793348822
 EBUILD arcconf-2.01.22270-r1.ebuild 978 BLAKE2B c8c700a7dea86d3f55bf9312a07d2d2452e9e4ccc9c5a4253a0fedda734d8a824ed8882420429a0640895b30873c87c1d71f6f49c76c58084f5bfdb47d31fa4b SHA512 86b98985be1629bac055ee853ee5315095ea9c1f6507ab633567e941de4eb5606f0cf16125063625e660ec4b1ee97dbf664df598d17d364f819b0f13005c216c
-EBUILD arcconf-2.06.23168.ebuild 958 BLAKE2B eb7ca57d646511441d6814be267647e5f755278fa757cede8715f3c9ad7ed5e4a94b484c550aa2bb1b6a4299e62d547ec176ce2f9fa70ada86304674f0b2211e SHA512 b088a44d494d8fe4a82268e6c4627475bf115b0385232667837d15d3d6b341fc6b51e7df0f4b9ccb15ddf698c8a9907b72aca6f9de4808b8c58f7c21b600568a
 EBUILD arcconf-3.01.23531.ebuild 946 BLAKE2B bf894169e4293dd45346219cf54f7e0523081151be19b2687c3e8d1ab92149c9c63ca2f7cd7377abc01c1b5e9da9a103328d69e3776ec628b31f988a4c665f84 SHA512 1a83b9882143db017e7362c11bd1c5837cfbed4744c0e62261cf7144ac048b1acafa6591533d548010299c3aae9170e48a30fde28a971358e625abc1fbe98b25
 MISC metadata.xml 938 BLAKE2B 93135d11cb82ab2618fcc991f26c71e89d991d27947a734871d6eeecf50cc9b4c5508738e329774e5d2ad4954988bc501659476c37d964e9dac0c188641c3926 SHA512 93858d9f2d59413f53dc80c959edf2d6e176a5fd9a8e4eea51d51fe1ddf481722fc20920d330d63cd40e294c9ea17c2076bc3c4abb8ff5243631440a069826d4
diff --git a/sys-block/arcconf/arcconf-2.06.23168.ebuild b/sys-block/arcconf/arcconf-2.06.23168.ebuild
deleted file mode 100644
index f716df467d9f..000000000000
--- a/sys-block/arcconf/arcconf-2.06.23168.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PV="v${PV//./_}"
-
-inherit linux-info
-
-DESCRIPTION="Microsemi Adaptec RAID Controller Command Line Utility"
-HOMEPAGE="https://www.microsemi.com/"
-SRC_URI="https://download.adaptec.com/raid/storage_manager/${PN}_${MY_PV}_h.zip"
-
-KEYWORDS="-* ~amd64"
-LICENSE="Microsemi"
-SLOT="0"
-
-DEPEND="app-arch/unzip"
-
-RESTRICT="fetch mirror bindist"
-
-S="${WORKDIR}/linux_x64"
-
-QA_PREBUILT="usr/bin/arcconf"
-
-pkg_nofetch() {
-	elog "Please download ${A} from"
-	elog "https://storage.microsemi.com/en-us/speed/raid/storage_manager/${PN}_${MY_PV}_h_zip.php"
-	elog "and place it in your DISTDIR directory."
-}
-
-pkg_setup() {
-	# CONFIG_HARDENED_USERCOPY_PAGESPAN makes ARCCONF segault
-	if linux-info_get_any_version && linux_config_src_exists ; then
-		CONFIG_CHECK="!HARDENED_USERCOPY_PAGESPAN"
-		check_extra_config
-	fi
-}
-
-src_install() {
-	dobin cmdline/arcconf
-}
diff --git a/sys-block/kvpm/Manifest b/sys-block/kvpm/Manifest
index 8c4091c6e61c..c55eab760e39 100644
--- a/sys-block/kvpm/Manifest
+++ b/sys-block/kvpm/Manifest
@@ -1,4 +1,4 @@
 AUX kvpm-0.9.9-glibc-sysmacros.patch 1858 BLAKE2B c5be79e19b94f62918cd5fd337ab228ed5c3d3d00e39788df16dfabc144d842509efc980aeeabf17b3a454f4147223cec97de7346c03122fee4776586d69df03 SHA512 b3cce6fe24d9df4e5f477b25e80403d0359f7f7b62f3c1da08fd8bfd534877cad6545f7807615518fc1f5f48b998776f0217541ba4aaa266842ae2ff67db96c5
 DIST kvpm-0.9.10.tar.gz 1313153 BLAKE2B ea2e668f493a845fe48e2bfafe883ca1739a2956da1ac734ac245e7768f3b0ce021d995ad6efd71c436546632433523cfe0886d7073598a193993f9bf09dd70a SHA512 825bc7f24e4b6f6aae9f218075cd7a24a8fed9ae34d0cc08ac136db501eba1abb5925aaaa937ae9d59869afb41b9f36737fd8c47bd6b560be94fbe90feba37d4
-EBUILD kvpm-0.9.10.ebuild 861 BLAKE2B f2b0a9105d9f73cde70a8143208ba2772aadd30f5d01a6a4fe3e1279699e0ded2e02ca6b26b74e1a60449d89a2b3c4afb53aac4d86fe7eb3ed769f1c4455f61f SHA512 6e73324c98039b124d9f7221b5807044db2d85f2046a58b805948aa3a58f0e05cad1bc2c2ddd762b9e2cd53b2d9d4f024ec00ffba414663d24de827c1b08eec5
+EBUILD kvpm-0.9.10-r1.ebuild 883 BLAKE2B fb444588a9f22bc9347069cb7fe813e691fb0487334697c24ae3365f297ca6df1405921f7b3f39084f54171621ed1121714465e8792700d34386d89ff01d2a13 SHA512 0f67139984e6ad122ebb1b290bde4973d6c81743dc4dc2ec6ecbb5d5a20482f4569ec71d7a406555a73c0c8974690f85b2cbb41c32a890c4b0c0ab4b13426130
 MISC metadata.xml 323 BLAKE2B d1c0d5e641448344d822f1fb2271976a600bee171fd7a4de5ea51f36aa81f42006b54465104821f9a96915bd7ecc0e941bd0271734153e408c69d564602b887e SHA512 f899a6f220dcfe6fad97dfe7e210228e3ae14cc75f70bc54ab79b54a4400869239ed3dfe892c61ebcdb9f3a8eb124246e5d85f57fa4ee60491a2f3973b3ef47c
diff --git a/sys-block/kvpm/kvpm-0.9.10.ebuild b/sys-block/kvpm/kvpm-0.9.10-r1.ebuild
index 525236fce8ac..0226a9e8cf30 100644
--- a/sys-block/kvpm/kvpm-0.9.10.ebuild
+++ b/sys-block/kvpm/kvpm-0.9.10-r1.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 KDE_DOC_DIR="docbook"
 KDE_HANDBOOK="forceoptional"
 inherit kde5
 
-DESCRIPTION="KDE frontend for Linux LVM2 and GNU parted"
+DESCRIPTION="GUI front end for Linux LVM2 and GNU parted based on KDE Frameworks"
 HOMEPAGE="https://sourceforge.net/projects/kvpm/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
@@ -16,7 +16,7 @@ SLOT="5"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-RDEPEND="
+DEPEND="
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
 	$(add_frameworks_dep kcoreaddons)
@@ -29,8 +29,9 @@ RDEPEND="
 	sys-apps/util-linux
 	>=sys-block/parted-2.3
 	>=sys-fs/lvm2-2.02.120
+"
+RDEPEND="${DEPEND}
 	!sys-block/kvpm:4
 "
-DEPEND="${RDEPEND}"
 
 PATCHES=( "${FILESDIR}/${PN}-0.9.9-glibc-sysmacros.patch" )
diff --git a/sys-block/mbuffer/Manifest b/sys-block/mbuffer/Manifest
index c5425cca850d..41f0a28607b8 100644
--- a/sys-block/mbuffer/Manifest
+++ b/sys-block/mbuffer/Manifest
@@ -6,8 +6,10 @@ DIST mbuffer-20150412.tgz 122935 BLAKE2B c57708861a9fc049fd4f3aa9c1229798a82e866
 DIST mbuffer-20171011.tgz 136630 BLAKE2B ba69435684b8c844701a51c5a77d0f5ecbf8bef3ca9b9739a63309524b14d0cbbeba422cee1c5d69f1029a42c18d089cea0bcc46dbeba7f51767df3a815f7de7 SHA512 398d7545388a94b4f8961193192cd5e1139b84f31c7699c2b7f66b84a40488a2e70c88a2a70578bd95375e11efc87978a5f6fec805dbbc5f1fea460b3a9c68c4
 DIST mbuffer-20181119.tgz 141445 BLAKE2B 8900b71af77b42ac6901285391bb571744bdcfd9fea307758b17be48f8ba3fa921c0e4752817d4feb8b139753440af25a8a8162f867e793d00e1baf8f1977e9e SHA512 0a30fa1c16f519a2ce82ae1f0f467dc9672e16affaff17f16cbec7bd3a28aea565e80ab4274ec24e60dd78560c692b8f852c7cba794a3715242f0d2385259347
 DIST mbuffer-20190127.tgz 142141 BLAKE2B 43ab5d92e0f930037da512f8310bb97edc534b8dbc9b76e36407ec87939e87667e723af026c6e48703a47c83c47ee72e82c36d4c99ab720a6c190fbb0bdfc30c SHA512 e42ba41ebe206cb34d16a4b8a2cf8470e8173ba3147ade8fb1fbb3e9fcf534e0a129f2327055a034a9e65c7b59b56441717641841d632709b02f3dd5e9962922
+DIST mbuffer-20190725.tgz 145246 BLAKE2B f0ec2826fcf59543c255c484bf3c901f8c515633a8f81042dcdfa5a712f2eff619fc031fffd6510f98c7348f49916c08ec1c465764546a606b9d451240e2768a SHA512 3f3670a0b618dadf47aa47310c88be96915af372c4dcdbdf3ba6b4d9c67fd994a027bdf6ed397c34c062499dbbc2b563ff9e79d8351c0faedfdeebe660ca4a25
 EBUILD mbuffer-20150412.ebuild 795 BLAKE2B 92d4c504fb558dafd340c80c814240c3dc266a8f1a28bddc8621004269da216a16b2630a637963c0478208c0e5761a6ee99570dbf1a96fd84058a377190c04ce SHA512 b4b9c424ccc4da361b00a173c4d18f0bd55994242f962c35c79dcd6edaec7c4f7e3ab29a18314b2dc047ea4916171dafaca57de7bf49ad18ae18a6989a93f32b
 EBUILD mbuffer-20171011.ebuild 1419 BLAKE2B b623eea89a7b8d913c885b818d94b83ca4883df2d44d2c36463d2e62d9240affed87290989359c51a380e56a763d31f98440de4a011a05692aa2ec686b890d07 SHA512 94da802069d9c9336d85fc837ab8debbd5441aa69530714b3f90690ff13b7e9ef42a86448ba1e443b60b3cacf7ac9646397b5c3f5f71256b5dd631490439539c
 EBUILD mbuffer-20181119.ebuild 1456 BLAKE2B cf6f4a9db384e77059cb01cf4e2e0c94331e59a17a66e1a4734d85edc591b616f59884fe68ec055238b66e464a655314a1121fe2ee11124ea7417a964b9f1fd9 SHA512 12c54c5a023a249722715250565fc04a398cf113e1719c47e5c0efd29f7f9638a9527fa25cf98d887d50f1a11acff00f652caf001887a3125994c2b14fdd421a
 EBUILD mbuffer-20190127.ebuild 1459 BLAKE2B a87dde3b2660aef09ce4f5a856e4b0ef749670d8bf12b2360fee723f2e25cc1fc0323da076d873958702330376219fb0d2022432ad7fb4fe74cbe3ca73f4d66e SHA512 c83578e3dc9f649ee256c0b5e2b1353f09d04812fa065dc036755d1d2a71b64c3075158a9d13b12aea7380ba6b79a10983637c603bb1c11ed94cc9786afd8231
+EBUILD mbuffer-20190725.ebuild 1461 BLAKE2B 532bf0487562555bb3d4b4eb6b34a108fddb36bee4a02aa9e97b1f817a8f4ec8f3402261a333992c1b13cb52f819c39a3cb826ccb98e6ef73ed7ccb96d21dd87 SHA512 2c05fd3280392b9b09f3165495e838ced872e8964c5d73cf6eb9d43d89bd3920494154763d15a7745cea0537e860875d5d171b127a4bf8104e2085ec9a467636
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-block/mbuffer/mbuffer-20190725.ebuild b/sys-block/mbuffer/mbuffer-20190725.ebuild
new file mode 100644
index 000000000000..77c4badc66e9
--- /dev/null
+++ b/sys-block/mbuffer/mbuffer-20190725.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="M(easuring)buffer is a replacement for buffer with additional functionality"
+HOMEPAGE="https://www.maier-komor.de/mbuffer.html"
+SRC_URI="https://www.maier-komor.de/software/mbuffer/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug ssl test"
+
+RDEPEND="ssl? ( dev-libs/openssl:0= )"
+DEPEND="${RDEPEND}
+	test? ( dev-libs/openssl:0 )"
+
+REQUIRED_USE="test? ( ssl )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-20180410-sysconfdir.patch"
+)
+
+src_prepare() {
+	ln -s "${DISTDIR}"/${P}.tgz test.tar #258881
+
+	# Enforce MAKEOPTS=-j1 because src_test() spawns multiple listener
+	# using same port and src_install may have problems (with /etc folder)
+	export MAKEOPTS=-j1
+
+	default
+
+	mv configure.in configure.ac || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable ssl md5)
+		$(use_enable debug)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	if has usersandbox ${FEATURES} || has network-sandbox ${FEATURES}; then
+		ewarn "Some tests may fail with FEATURES=usersandbox or"
+		ewarn "FEATURES=network-sandbox; Skipping tests because"
+		ewarn "test suite would hang forever in such environments!"
+		return 0;
+	fi
+
+	default
+}
+
+pkg_postinst() {
+	if ! has_version "app-arch/mt-st"; then
+		elog ""
+		elog "If you want autoloader support you need to install \"app-arch/mt-st\" in addition!"
+	fi
+}
diff --git a/sys-block/partitionmanager/Manifest b/sys-block/partitionmanager/Manifest
index f45ae0cad2c9..32640b998a87 100644
--- a/sys-block/partitionmanager/Manifest
+++ b/sys-block/partitionmanager/Manifest
@@ -1,5 +1,5 @@
 DIST partitionmanager-3.3.1.tar.xz 1332860 BLAKE2B ba258efd7cebae907fdb1bcca4863300f3af21e4fb533cd5a07e8a1978f07add5f863d4be0d711346074e2d6fa4e96a85f8824aded9eae717c820892a13284ab SHA512 9189004c27a118510ddf7f148d2a245a7e17d0d0c038ea7486fc50638f2897f947ef2a2a92f0196c277b14e8dafb2f1e2f20978cce5927c04299232ecf8260b0
 DIST partitionmanager-4.0.0.tar.xz 1327504 BLAKE2B a0ce0daf5a0ef922ca881562da25efd0118115df5e0a7d00ddb6ab994d7ea523cd67772bbaf562b6b33edd5ddc451fc49067d9c8992d734d4e2816c13cac6c45 SHA512 dbdae666b29996a7ef463159cd96469cf5081ca9027d1d59556e21556e2488485c0d4bee1e9005a446a47b13e3c1e4b71014f58c7bfa830adfd7c39364f4581a
 EBUILD partitionmanager-3.3.1.ebuild 973 BLAKE2B a72773391e4024094aa247b2a8c1e2ba03789a2ef194a6376f5e38537bcdc4862d66623341e312ad0e71f6afe55f16e72441d2139b4ec4d5cebc5994032e0245 SHA512 1d0e28db0790a8cc03fef0f159607c46a6014c348422bf1f5e15bfdad92d59cd81e47199ea4629f92018669cf76199d93e4dd6b66814f5dcab73942e5c29cebf
-EBUILD partitionmanager-4.0.0.ebuild 946 BLAKE2B d31c710c609ce2d2b562d5d42058af5927fc18be879be69281823f6e6421ce1e080ca29b04fa3099c466f711b47ca4e10c477dc0e9d070fa9194b10a6df2672f SHA512 d31b6d66393f53272560ef96e25608df47a3dfb7dbebd72578fd5fb59234c6f56d9916890cebc28bc6c668f6c109d78c2168f34f1148a2b58d4b2d5dda7828eb
+EBUILD partitionmanager-4.0.0.ebuild 950 BLAKE2B 5e1626cd9acdad87c5c0650d34f16ef11732f3ee540444a2c08eb55592935dc39feaec77ec624e313150ccbc02bf4739cdbb6fd42a86a76188a3a1c717481d63 SHA512 b95ef21cb4616b362817607fa6b83e00229d12480f37565c044fe518a40a237eea8404519e648b3ebac2f12a3d2f6eed73cbe3495aea8c9345baffe6c6175b26
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/sys-block/partitionmanager/partitionmanager-4.0.0.ebuild b/sys-block/partitionmanager/partitionmanager-4.0.0.ebuild
index 0095c8aa9641..66747b9df02e 100644
--- a/sys-block/partitionmanager/partitionmanager-4.0.0.ebuild
+++ b/sys-block/partitionmanager/partitionmanager-4.0.0.ebuild
@@ -8,11 +8,11 @@ KDE_HANDBOOK="optional"
 inherit kde5
 
 DESCRIPTION="Utility for management of disks, partitions and file systems"
-HOMEPAGE="https://kde.org/applications/system/kdepartitionmanager"
+HOMEPAGE="https://kde.org/applications/system/org.kde.partitionmanager"
 [[ ${KDE_BUILD_TYPE} == release ]] && SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
 
 LICENSE="GPL-3"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/sys-block/storcli/Manifest b/sys-block/storcli/Manifest
index b4f661981e6b..0ade820d8617 100644
--- a/sys-block/storcli/Manifest
+++ b/sys-block/storcli/Manifest
@@ -7,11 +7,13 @@ DIST storcli-1.23.02_readme.txt 201906 BLAKE2B 6dde1f7609d51f3d0b2feec9301a57472
 DIST storcli-7.0504.zip 40558670 BLAKE2B 3cd54b47b42e5bb8329ccd4b09a6c0863347a04b276fa5dc11acf10ac1124c25b5f60e4171de96c1b8975bfae4cc7408554de933ba8fd5547fbd6e9395710ce8 SHA512 1c5c248a1c19eda5974415a7e1cc10c83bfad0d6e37adbd01ae624316fc1d60628503655c4dd0005a14c79c570177664ea9cdb7330b97daf19808a9513b1311a
 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
 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 2347 BLAKE2B ed6bcf2602ec1a5db7228039469710c233d5b2955a353dd622b6f2613f9866580ad88285012bfa49f4a24ed8a9143f6ea5c7de51a083cca903c1e8c491e02059 SHA512 ffe5dd86ffec62f9d0dc287c831196fb04c3c151b8e233dee4bb86be29d88b8a76f79a4027117e709ff3990a43ca18c4f5dccdcb18ae0a106402ae8882076d49
+EBUILD storcli-7.0709-r1.ebuild 2345 BLAKE2B 3a03247560eceebed6c1413850607eb7c2b7f551668f2163745ba2c717450c72ccdaacea7bc328bf536a959b22b4e6478d718ba30b4b56ac6daaa34501fd0672 SHA512 e76b173a67d812f10dd21d5319ee1b9dfd20ba285005caeac9dac5b34a5f5306e0f64c5887dd7e852bdf838fd529c07bd2f3b5d593b8286502ae3bfe23596635
+EBUILD storcli-7.1017.ebuild 1810 BLAKE2B ac0928c466af3f0a87b333002c242ac82c6592b359e026c49690d734660a4a44b4fe5e34cb1b67696369c7d101f7f250da729cea9cd51750dcf39a423b29b740 SHA512 6006b68ae8fbf475909263b96a807942dfd686795bef2ff6e7e017a09766f7fc693715896c31d000cd0001a0ea7f6b4f797d4d2e13fccfe70cb583ab3755cd64
 MISC metadata.xml 251 BLAKE2B fb85d245662fa1577cfe1d77526bd34fb2a674dd447192f2defe78b751423e3d14ae73efd3ac0e1e5e6fdb6259622a782e724ec77021faf526509f199dd20d61 SHA512 46942a98ef7e36470d1169a5bc8839d25603e33c143cd36327a8a85fc14cb6bfb32247eb7608d92cc58a06cc8eef5bd64d6ec2d21e69a88632e4b936598aa772
diff --git a/sys-block/storcli/storcli-7.0709-r1.ebuild b/sys-block/storcli/storcli-7.0709-r1.ebuild
index 65a0583219bc..eaebee5c38ea 100644
--- a/sys-block/storcli/storcli-7.0709-r1.ebuild
+++ b/sys-block/storcli/storcli-7.0709-r1.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.7"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/sys-block/storcli/storcli-7.1017.ebuild b/sys-block/storcli/storcli-7.1017.ebuild
new file mode 100644
index 000000000000..7122690d293d
--- /dev/null
+++ b/sys-block/storcli/storcli-7.1017.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.1017.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/MR_SAS_Unified_StorCLI_${MY_PV}.zip -> ${P}.zip"
+
+LICENSE="Avago LSI BSD"
+SLOT="0/7.10"
+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 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.gz
+
+	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
+}
diff --git a/sys-block/tgt/Manifest b/sys-block/tgt/Manifest
index f0e2aef5693a..68225ae7d8bc 100644
--- a/sys-block/tgt/Manifest
+++ b/sys-block/tgt/Manifest
@@ -1,9 +1,7 @@
 AUX tgtd.confd 108 BLAKE2B 74e5f66f6fb193541853e562cd1de5e99806f1f324db6efb5f9a5217935044dd61237171b368dc1747017fbd9094d8c3acae4dfde0d5dfff69957c3f8800d63c SHA512 2153e99e3f6a2178bbbb2bda1d6af9a67d6080b36e7c5cbb4f951b10324c80a24fa224a7003c26b3b51d40a77bba97856bc009bbb0e664e93625face723edc91
 AUX tgtd.initd 3435 BLAKE2B d2441a515c7a270472efd0c4ef5e928827bde54b248d09bb47f4fcc53c46e4678acf049c16ee761f29eb8e928f0713f38a9f73bd13db1e0408da56f42f64b337 SHA512 1e6d114dbb89c7a26e65546b6c775bcabc3c9508e0757e118a4272fbf4299a185b4679bc510d9cc3da7db25b96343ddc8e45de044543ebe26d952132eba4de30
-DIST tgt-1.0.77.tar.gz 297550 BLAKE2B fdf5728b8b2d796a0b7d0845948d51161b1d2fa148c05e0c3940426a524246b3303b2e9aa6e748df54090ea3682a449edcf65c523ebd1e6d43b142e9339a605c SHA512 ad8d5519a6c1a46991d5b8c2f6d2990e2d064b81e82fb4700728153accf6aff05dab79c9d91ee55a9a6c344e7bd7451de4f26840162e08467a81a11d2d841bdd
 DIST tgt-1.0.78.tar.gz 297886 BLAKE2B c9edf8e5d0fe6a9788ff6bea4097f6cc0a8a905ffdc1943dcab538843445ede9142e1684121dad7f80677207607e20695bdad04fef622364c23df7cbeab1339a SHA512 dedafd490b6a042041fb9c8ed751747ec85f3bddab849fee301e0cf43b18aa92f5609657136700b867667fbff9ace62f4733c535cd425d8c71b072a7d7029430
 DIST tgt-1.0.79.tar.gz 297898 BLAKE2B d0f18dac863d6983a00eb9513bcbe17b5cbed76fad998af74b65311c1ace6f281bfb1bf639713e10124a520ad3916ef79ca0a81cef97b5ef678c25cfa9a71eaa SHA512 d71b0a08bd1cdc717e22c4dd0a229e84bd19e02e01037231ee80d9ab24848bc7274050e1ffe7d9a3d50149c892ed1e6ea382e54dacc341650f4534629116be07
-EBUILD tgt-1.0.77.ebuild 1511 BLAKE2B 4617ed3355872a200db6b3f0436a383368936f187797de30fb895a01f89a9a3c1fb5efa6848f3d2475760f425e374c1a281cb9943e4fa9dc6fd4576c035dbb9f SHA512 7c45a432e8a250d7ebf20c441e44b662520db2884079c51e4abf88c3b45882a9df0cefb34355e669b317e25f312bff41c220c46c929ea6e91a880c9b564b48de
 EBUILD tgt-1.0.78.ebuild 1511 BLAKE2B f8c27f0ea227cbbe2cfd26d8c38c5834a21114fba89bc0d2574629802cd93f9954022a6dbfbe3375538f5fb5f5c31612dfcf1ea2de2d1ff3b31b03c55bbbe026 SHA512 bd541ac602eee81239c350b7b34e812fac716175bb29bb5869727807dc2e3c81e9f353e7b24df7817a32fe7318ac25137ac42cc9b21a55e694d7976125815643
-EBUILD tgt-1.0.79.ebuild 1513 BLAKE2B df90e7dcbc2228ebb1c0b4b33ef911b827be59cfe680f41dcf8a0e4809d83556f7223fa699907bf14e761d4bb75149381d837b90f5fd11a5c55cb3231470809b SHA512 1887cb85f7172657c16ae86d2383546a707434b4b5203e24371ab3e513aad869ccc9de51d60ff7d1ce1c070a8b7e103ab4beda5c83124ac120169ff369e561b9
+EBUILD tgt-1.0.79.ebuild 1511 BLAKE2B 9f76a2b4a07d081888e32a86449edb29519d9469b89bdd36c743af49d1e40dcf676765e161ad0935dc25b1663084d2f66f1e0f267afa005bc4ba8a2577f510f2 SHA512 24a3abc92a2ab714f02282d127fb62468b5d21f00194a5b19396bcc2e3498bef3a2a2c1d25411e195f654fd4c559abbbfa3043be823982030fff93127d8cebc2
 MISC metadata.xml 825 BLAKE2B 89a6844eade4098443db47dcd5b3350c1bd6f4c0ffbdb6277df5714fdfd248d056f770f05e1392d64b573a28ca9db140dc7130e0109075c7fd398677ca251af9 SHA512 0c75be2e830ff683c8cae93175504a1e6508131d704c48d31b9fe98baa6b3a1e491661fda6180c0c1e35ef7e9bd57309d05e07b41160a7cc090934913e186f9f
diff --git a/sys-block/tgt/tgt-1.0.77.ebuild b/sys-block/tgt/tgt-1.0.77.ebuild
deleted file mode 100644
index d89c4603556e..000000000000
--- a/sys-block/tgt/tgt-1.0.77.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit flag-o-matic toolchain-funcs
-
-MY_TREE="355a4fa"
-
-DESCRIPTION="Linux SCSI target framework (tgt)"
-HOMEPAGE="http://stgt.sourceforge.net"
-SRC_URI="https://github.com/fujita/tgt/tarball/v${PV} -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="fcoe fcp ibmvio infiniband rbd"
-
-CDEPEND="dev-perl/Config-General
-	dev-libs/libxslt
-	rbd? ( sys-cluster/ceph )
-	infiniband? (
-		sys-fabric/libibverbs:=
-		sys-fabric/librdmacm:=
-	)"
-DEPEND="${CDEPEND}
-	app-text/docbook-xsl-stylesheets"
-RDEPEND="${DEPEND}
-	dev-libs/libaio
-	sys-apps/sg3_utils"
-
-S=${WORKDIR}/fujita-tgt-${MY_TREE}
-
-pkg_setup() {
-	tc-export CC
-}
-
-src_prepare() {
-	sed -i -e 's:\($(CC)\) $^:\1 $(LDFLAGS) $^:' usr/Makefile || die
-	# make sure xml docs are generated before trying to install them
-	sed -i -e "s@install: @& all @g" doc/Makefile || die
-	eapply_user
-}
-
-src_compile() {
-	local myconf
-	use ibmvio && myconf="${myconf} IBMVIO=1"
-	use infiniband && myconf="${myconf} ISCSI_RDMA=1"
-	use fcp && myconf="${myconf} FCP=1"
-	use fcoe && myconf="${myconf} FCOE=1"
-	use rbd && myconf="${myconf} CEPH_RBD=1"
-
-	emake -C usr/ KERNELSRC="${KERNEL_DIR}" ISCSI=1 ${myconf}
-	emake -C doc
-}
-
-src_install() {
-	emake  install-programs install-scripts install-doc DESTDIR="${D}" docdir=/usr/share/doc/${PF}
-	newinitd "${FILESDIR}"/tgtd.initd tgtd
-	newconfd "${FILESDIR}"/tgtd.confd tgtd
-	dodir /etc/tgt
-	keepdir /etc/tgt
-}
diff --git a/sys-block/tgt/tgt-1.0.79.ebuild b/sys-block/tgt/tgt-1.0.79.ebuild
index e6f4ccd368a9..dddcd494c5e4 100644
--- a/sys-block/tgt/tgt-1.0.79.ebuild
+++ b/sys-block/tgt/tgt-1.0.79.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/fujita/tgt/tarball/v${PV} -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="fcoe fcp ibmvio infiniband rbd"
 
 CDEPEND="dev-perl/Config-General