gentoo resync : 25.08.2020

50 files changed, 473 insertions, 801 deletions

diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz
index 1498a871ef7f..0a76cba778a4 100644
--- a/sys-block/Manifest.gz
+++ b/sys-block/Manifest.gz
diff --git a/sys-block/arcconf/Manifest b/sys-block/arcconf/Manifest
index 3bf40d1b6ec1..051958c5427b 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_v3_01_23531.zip 76188493 BLAKE2B bb939262e89a76fe28cca60ce647df53bd66625d8273cf80ad0b9daa31de8ac33d181a5ad864e52ce5b599d9631a503d2e4a132ec3369b67f0e12887a4bccc0c SHA512 93ab1b5f3f35ad403ac52456ffb16b5b57c4851dbaa3d4922194b29b72957944a0a3e02346362f62b3f6ba5f73394a3720a1f5a371b34e9a03f31bd793348822
 DIST arcconf_v3_04_23699.zip 89105029 BLAKE2B 338923a508cb3b55d93128383b02a1bc650436689c29af6c2658c13af6789cacf89354ca2f5d79d84cc485e2559b26929269f591cf99412427f88ba5ca872303 SHA512 d87ca4edae53505fbfd1042df4ae38a9d8ff51cbaaecfe2de45d136d9a8f3a7713b0104e126f281b02a61fb91f9188aa7846a31ab51757cd0ff5cb91348fae80
 EBUILD arcconf-2.01.22270-r1.ebuild 975 BLAKE2B b2cd433799f0cb7342981bfc3f95b2b066e5d5c806d483c10bead00045bad265c1f1fcd755d594da0485b8ff1e99a68f4bb2bde01becbcc961ad4f27a0f5502e SHA512 5d43eedf6dbc6e0fbd52c1bfdd4f8cca1a0611bc325df165007a276def4df0d9fddc875d53a1b8bf514621233e31515016dfed5a7370401b66daf91ffb2aa8f8
-EBUILD arcconf-3.01.23531.ebuild 944 BLAKE2B 34e9dcec3a6a308d855fa29e4a5bd2ad0f0e7b886262e70704fadfa9529c112ee82a7b718a6d3aa5c5d0431dbaea18b044d14b73e97948ec1b29db052cda8131 SHA512 0031f2517135fc31ac9b04f726ef95f240c8aceee52914aa80ba58e980ecd06420e9e695d25b4fdff3f75619e35ab76c689dc93334b8a95d53cc9554c34dc94c
-EBUILD arcconf-3.04.23699.ebuild 940 BLAKE2B 497eca716ba93b401acfb2763abebd7cb9c27c0c528010df6877aa530d6789fb4f816591cb76e55e2a8d135557a2d797b7a726b852840cdd642fb729425000c3 SHA512 d976d04acb73acda06bf626f67f7fcf22356c4881f18e4b919160d92258399e368f1804738636dd84cc35a9b71cd7dcfdbef54d49fc846b5b683c050d32811d7
+EBUILD arcconf-3.04.23699.ebuild 939 BLAKE2B 85b2dd7f98e7b571de6d7d49a761566031d9458e84f351b911cd5e8a3ea3a913c60164afcdd32821494372a642a025fca68ccc5a3295ff8b8b556f55023e0173 SHA512 9e0445d0d1338514fa86e2f0a15806d74cc5f6dce1a792656ad498cd5241f60c0b8be42cbf74e31925f0d326b413ca70c20683a1432477f8e8994a43e943a7b6
 MISC metadata.xml 819 BLAKE2B db0209c49563799b6e71389de7f139c9590406e24272bacd67f667fd544d66aedbf0869d4dc09ca1590601ab0f1a5393a618c408d66e3a447854f0f47df5f99a SHA512 a8e9ba3d80eb67f5ece7d1e1ef4dd7c77da021000daad99fdb191ec59aba378421c6a313a43c13560909fa08e1edbb68baeb700c5a8e012be0f60439a12c6182
diff --git a/sys-block/arcconf/arcconf-3.01.23531.ebuild b/sys-block/arcconf/arcconf-3.01.23531.ebuild
deleted file mode 100644
index c0d29d9efa26..000000000000
--- a/sys-block/arcconf/arcconf-3.01.23531.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 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="http://download.adaptec.com/raid/storage_manager/${PN}_${MY_PV}.zip"
-
-LICENSE="Microsemi"
-SLOT="0"
-KEYWORDS="-* amd64"
-
-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}_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 arcconf
-}
diff --git a/sys-block/arcconf/arcconf-3.04.23699.ebuild b/sys-block/arcconf/arcconf-3.04.23699.ebuild
index b76fa23acde5..7c08e1be3cfc 100644
--- a/sys-block/arcconf/arcconf-3.04.23699.ebuild
+++ b/sys-block/arcconf/arcconf-3.04.23699.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://download.adaptec.com/raid/storage_manager/${PN}_${MY_PV}.zip"
 
 LICENSE="Microsemi"
 SLOT="0"
-KEYWORDS="-* ~amd64"
+KEYWORDS="-* amd64"
 
 BDEPEND="app-arch/unzip"
 
diff --git a/sys-block/blocks/Manifest b/sys-block/blocks/Manifest
index 6a8e2fbc2c23..ab0bd371a38e 100644
--- a/sys-block/blocks/Manifest
+++ b/sys-block/blocks/Manifest
@@ -1,4 +1,4 @@
 DIST blocks-0.1.4_pre131210.tar.xz 33684 BLAKE2B 4f41747cb589c90770eeb80a648fafe8c7463659a2b1fbed94fdebdc00ef0a595f4d14df0e2284a0e3889eecc0fccd69d92839e5aaaaf29d1d378224d5708030 SHA512 05ad49f2ece5cdb92097f60b5f69cfbb7d409ac5e1ffb98488f26b51ad07ed7dad8eeb3fd302a06b3e199e816e45c2c69daecc13a19627252b8245372f324a58
 EBUILD blocks-0.1.4_pre131210-r1.ebuild 1312 BLAKE2B e40ac8caea0ec9de5767fd3db3e5e6c46e846b0971176a49ad2a43c348fc5b575ce62a664e81eefbdf534c677697e02bca695f50106d267cda6880a7b0ef7276 SHA512 4521f30fb966d6ad14795cc207d5b0b6399c8dc1469bf9df306d6954ad4f96e674c34b8df5edf35ae8c1e3ac4eca14070e46a8b77a8c3be1e076bcb3d39c6864
 EBUILD blocks-9999.ebuild 1284 BLAKE2B 709c9961bea1aaf1e014711a2c50bf5876e15bd930423ad23f67f76c93cb76ec86ec87f8cca0a0b04ccaeb1e3db8e26e3b5584b38c3cf440f3782795ea3f332c SHA512 a2bc6096339911c07556ea515b07e87c69ed649e5b01bfabf452ba0116a326b1d54e84a77f16b55537b1a1c8a426d1d108fd95e4ffbd67753dd0c1822bdcf271
-MISC metadata.xml 475 BLAKE2B 592b39aa9f5554e849d866a8fa4de1cbc2b6769aaf16f2a63b8835f5571f0a4280fc4e77963d9cf32a4f55567b55c9b58ac501e2a6917f13a58d929a81fdd796 SHA512 acb1345d5edd42ded851e80dfe07f0c97093ec09e4b2308cff57cae64041da052cac25282a22146107348e72366601031deb830fa55975c219f71963cae9e406
+MISC metadata.xml 424 BLAKE2B e60a5addfad8da99ad6c00d8755bf09ac5a0986dadf33e559132f7732a228d99c2fcf672ad2f3ea2cbf4b2df498d5242795d6a8d1c9ade181f1c7d7d1131481b SHA512 5c2299bb2232d9687a6605fdcc47ac632f2148faf08f3dd6823f4b70abd3ee1438a1dcc839afa5bb9fc64a4b57d6f0ccf83683a5c6e4c2a31df69903c832880f
diff --git a/sys-block/blocks/metadata.xml b/sys-block/blocks/metadata.xml
index 5e2c054b0927..1ff023ef021d 100644
--- a/sys-block/blocks/metadata.xml
+++ b/sys-block/blocks/metadata.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>jlec@gentoo.org</email>
-  </maintainer>
+  <!-- maintainer-needed -->
   <longdescription>
 Convert between raw partitions, logical volumes, and bcache devices without 
 moving data. blocks shuffles blocks and sprouts superblocks.
diff --git a/sys-block/fio/Manifest b/sys-block/fio/Manifest
index 235b7919c458..2c02f20121dc 100644
--- a/sys-block/fio/Manifest
+++ b/sys-block/fio/Manifest
@@ -2,6 +2,7 @@ AUX fio-2.2.13-libmtd.patch 398 BLAKE2B b1519ed240879f1260e3f5859c9cada3f4116145
 AUX fio-2.2.15-rdma.patch 1667 BLAKE2B 7744c58500f0d3c73eb63314bc939f03190907c232ea29b73db5e0ed44cae14e02a621e843c24e37d4a3f877a847800f42c87f5a5b62b8fe2a2ee6ea0e2f511b SHA512 aad747697693a8cef151ae9f60ea5c187cfab92aefd68046fd08c28bc1f173d5bd3c3315f5f5f6de082e7d5ceb357beb3becd159bfec1507e3ab1707eb8b796d
 AUX fio-3.16-snprintf.patch 1723 BLAKE2B e1a8cbae3cc41163cd33118622d6d1888d47769bfa8d3fcd1df8def3b2dcfa8678d69c91cdac945a93172d21026efdb60363c0430765ef08519e6355e92b2732 SHA512 c9119a6c057367aa82ea204f29e78ce7c49c5fe2ea46dba3d6d109e9654a85feb47f7dfd04e8dbed76ddab642242f84fe7d5ff566493df018ecd496f64ac14a1
 AUX fio-3.16-verify_only_numberio.patch 1986 BLAKE2B 858cfaa1b452803451c160fffb779f83f118d06e984451725e4809bccd3f65367ba77039052ce876414a00bd32d87dee3f10817b3a2e0a09622b24b3c6612b4c SHA512 d43b2a822189483060d9b33d02c56c7676914054f79bc133eb57cd219504cfc5a9331761e193b912e287a14ac7a8d35619b2ca2061b6f71ffdc604961288e800
+AUX fio-3.20-fno-common.patch 1220 BLAKE2B dcfaac74241111cae75ebf956f34258ce883b6abb360b51eaa6bf80c91770d0d4307818e7daf63dc284c3b21a0869d54523d9b4c5cb4733fac898d05c17c8933 SHA512 04e435073204d158d6e8a5de87681cd70fa76c80c82b4c86e3e12650288c3bb2c0c457d64e05812e94f9e07172b5df36542f330306bdbab8222ec2464bda12f4
 DIST fio-2.15.tar.bz2 545809 BLAKE2B 163530097a6ff08016c977a328bc499d052c423890c8e7074bc91fb00b02b3d951dd0369ff772fa5f36a37e0b1b7d6b358c3df99bf70db9bec2bbc7f90eee596 SHA512 fa3380031e6e0a597eb34e597af91efbc824a3d5753793fdb00cb10e693943e0358afaad9624eb4333e81182c94424a56fbd1d434eeff098dbf2fc4e19167db0
 DIST fio-2.16.tar.bz2 558662 BLAKE2B cbc6e6000bd497fc92779c34688c0862f3adccd7c399ca5d4e4ce9ee9c40faddfec9b3fcca2fad2cd91ca00eee95c4a108273496c9e63db8017695ecf42d294d SHA512 f71c8ab8423e82ceae160bae8c17ac1222c1b2dde2ccb1b2aedb2288e0eb60485f8e9f3908640d4f6cebf166a148f4ad64026c035381c5db5141bf3059349d75
 DIST fio-3.16.tar.bz2 881436 BLAKE2B fee99930d0245474eb67ceee2d1a6ec2f1a0eb4da6d52cf8616d7eda64699a8c2727715284134fd4931e91efad69b064f66a80a78f70ea03e66d4eab4e601120 SHA512 2d651b20cbc6c7babf3adc082dbe78e1f7de920764653cf5ffd99df7516cf6190ffefe2152d2739326d3102949d9bad7db978ff88866cfa54020f9ec3b0a2a23
@@ -18,6 +19,7 @@ EBUILD fio-3.17-r1.ebuild 3944 BLAKE2B 332569e86cb7542fe3003acd4eecc2fceb34d987d
 EBUILD fio-3.17.ebuild 3548 BLAKE2B 4a13146b9ade206190d95a4daa235e4c2c15d040335e5eee8a9fd55a50e643c27b9abc2f42095e96291b3e70b69f38a0048effc9899937926f50e52ebf77f408 SHA512 fb04e3eda7ba0f4f3f5ffc905c502ed1a0a3618d131fce539f17a6cd3d2b1f5aa2c33645504eb18c292d86d22462f84f149712baba862df4e8b5c9aafdb74fe1
 EBUILD fio-3.19.ebuild 3894 BLAKE2B 558a90a4f245837ee0044529d2e09d381c5675410239abd2f21a5376299d51626a09494d50b5e09194ce2bb0759686b4ce47994ed9f394a65e8e7bfcf86f42b9 SHA512 8f2d3c714e4a53691353e51ddf0b50da0d5e614f5af0c126b724d3264e99823124b54c4602e12e499f4e8e752e0df5eade5b2fcc921680dded6e664387cc8d9e
 EBUILD fio-3.2.ebuild 2855 BLAKE2B 9496bc95ff5ad4511285897285904b352e8e5e1ba547f8eed4932bece1b98f229c7677405c3f6af7e6948ab710e13d79612b94d9442f8371f63cd2a15003b9c6 SHA512 72db1a54e4e876142a7e4c1b16fa467fc0024a1d67eda20a77c97a9685833a03d5a0acaa54b07e0e62e3e12ebd128d2e49ccd58e36758f70c62ca9df25d09bd1
+EBUILD fio-3.20-r1.ebuild 4432 BLAKE2B 307c850c639c5395e3b972feffb16ca1cf329453f17f6845062e7b2390e62774ae92db7171e816c59cdd3976da41fb92af2104ce60b00681dbe960ed41398ae6 SHA512 ed4185e3a998fc03dcf773b1b06200cdcfcbd901fd35fac09adaee9023e762d89750277d10e35f99c9d289555466754c745a89d89d33853d4c98bcd3eff7f623
 EBUILD fio-3.20.ebuild 4391 BLAKE2B b9689e5ee54353db6d0e60afb69da68a06c70fd7f5af41efcc11887c20a6bd53fb2d2e38b23719bec79d155e696e07bcc399013e85b619c6403f7e33a343dd77 SHA512 a574abda812f38276aca681fdaaa38fb043ad5dc111ae62086db844e659794ac7ce14995356d339e4861d7e50f7f2db7bc2bb8c47bba17c1f7f93767d0f6f8d6
 EBUILD fio-3.7.ebuild 2996 BLAKE2B 66bbc26691006fe8d796009b2260ee768a251e462280d5c0fb7871a96bd67fd9955a02624ecee60ec34fec2218cb89ae5c782ee87dd237f6f9d5d77698dec482 SHA512 7cc3d4a80c9f608da5d5c8da831f1acd46e0fcb8ac90808f24cc876203e831317b19d4778d951db0e1bfacf73d96acc4c1526095967d198263bbb0f89c73bf46
 MISC metadata.xml 1172 BLAKE2B e35bbaaa15c8cd095791a4a23a7344314a015ea42bb864b11bb165d340585ee667f969426282465b834a7d092ab6885736e55ec8d4fe950001fbb6336fdfdc14 SHA512 defbc7f932a5ab83b67da58a601ef62784b27f2268f8a8dd5057c02fb441b164bd0945217fa52a0e06803c74b5168dda3b4668de52f593d5cade428bd2f79e86
diff --git a/sys-block/fio/files/fio-3.20-fno-common.patch b/sys-block/fio/files/fio-3.20-fno-common.patch
new file mode 100644
index 000000000000..f7306bd6a09e
--- /dev/null
+++ b/sys-block/fio/files/fio-3.20-fno-common.patch
@@ -0,0 +1,51 @@
+From 63a4b9cca4ba3aa4101051402cbbe946ced17a49 Mon Sep 17 00:00:00 2001
+From: Jens Axboe <axboe@kernel.dk>
+Date: Tue, 2 Jun 2020 08:20:03 -0600
+Subject: [PATCH] gfio: don't have multiple versions of main_ui
+
+Also comment a fall-through case appropriately, so newer GCC
+don't warn.
+
+Signed-off-by: Jens Axboe <axboe@kernel.dk>
+---
+ gfio.c | 4 +++-
+ gfio.h | 4 +++-
+ 2 files changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/gfio.c b/gfio.c
+index 280539685..734651b67 100644
+--- a/gfio.c
++++ b/gfio.c
+@@ -38,6 +38,8 @@
+ #include "gclient.h"
+ #include "graph.h"
+ 
++struct gui main_ui;
++
+ static bool gfio_server_running;
+ static unsigned int gfio_graph_limit = 100;
+ 
+@@ -223,7 +225,7 @@ static void update_button_states(struct gui *ui, struct gui_entry *ge)
+ 	switch (ge->state) {
+ 	default:
+ 		gfio_report_error(ge, "Bad client state: %u\n", ge->state);
+-		/* fall through to new state */
++		/* fall-through */
+ 	case GE_STATE_NEW:
+ 		connect_state = 1;
+ 		edit_state = 1;
+diff --git a/gfio.h b/gfio.h
+index aa14e3c7d..2bf0ea242 100644
+--- a/gfio.h
++++ b/gfio.h
+@@ -78,7 +78,9 @@ struct gui {
+ 	int handler_running;
+ 
+ 	GHashTable *ge_hash;
+-} main_ui;
++};
++
++extern struct gui main_ui;
+ 
+ enum {
+ 	GE_STATE_NEW = 1,
diff --git a/sys-block/fio/fio-3.20-r1.ebuild b/sys-block/fio/fio-3.20-r1.ebuild
new file mode 100644
index 000000000000..445de828e1e3
--- /dev/null
+++ b/sys-block/fio/fio-3.20-r1.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit python-r1 toolchain-funcs
+
+MY_PV="${PV/_rc/-rc}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Jens Axboe's Flexible IO tester"
+HOMEPAGE="https://brick.kernel.dk/snaps/"
+SRC_URI="https://brick.kernel.dk/snaps/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="aio curl glusterfs gnuplot gtk libressl io-uring numa python rbd rdma static tcmalloc test zbc zlib"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
+	libressl? ( curl )
+	gnuplot? ( python )
+	io-uring? ( aio )"
+RESTRICT="!test? ( test )"
+
+BDEPEND="virtual/pkgconfig"
+
+# GTK+:2 does not offer static libaries.
+LIB_DEPEND="aio? ( dev-libs/libaio[static-libs(+)] )
+	curl? (
+		net-misc/curl:=[static-libs(+)]
+		!libressl? ( dev-libs/openssl:0=[static-libs(+)] )
+		libressl? ( dev-libs/libressl:0=[static-libs(+)] )
+	)
+	glusterfs? ( sys-cluster/glusterfs[static-libs(+)] )
+	gtk? ( dev-libs/glib:2[static-libs(+)] )
+	io-uring? ( sys-libs/liburing[static-libs(+)] )
+	numa? ( sys-process/numactl[static-libs(+)] )
+	rbd? ( sys-cluster/ceph[static-libs(+)] )
+	rdma? (
+		sys-fabric/libibverbs[static-libs(+)]
+		sys-fabric/librdmacm[static-libs(+)]
+	)
+	tcmalloc? ( dev-util/google-perftools:=[static-libs(+)] )
+	zbc? ( >=sys-block/libzbc-5 )
+	zlib? ( sys-libs/zlib[static-libs(+)] )"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+	gtk? ( x11-libs/gtk+:2 )"
+DEPEND="${RDEPEND}
+	static? ( ${LIB_DEPEND} )
+	test? ( dev-util/cunit )"
+RDEPEND+="
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_any_dep 'dev-python/pandas[${PYTHON_USEDEP}]')
+	)
+	gnuplot? ( sci-visualization/gnuplot )"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/fio-2.2.13-libmtd.patch
+	"${FILESDIR}"/fio-3.20-fno-common.patch
+)
+
+python_check_deps() {
+	has_version "dev-python/pandas[${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+	default
+
+	sed -i '/^DEBUGFLAGS/s: -D_FORTIFY_SOURCE=2::g' Makefile || die
+
+	# Many checks don't have configure flags.
+	sed -i \
+		-e "s:\<pkg-config\>:$(tc-getPKG_CONFIG):" \
+		-e '/if compile_prog "" "-lzbc" "libzbc" *; *then/  '"s::if $(usex zbc true false) ; then:" \
+		-e '/if compile_prog "" "-lz" "zlib" *; *then/  '"s::if $(usex zlib true false) ; then:" \
+		-e '/if compile_prog "" "-laio" "libaio" *; *then/'"s::if $(usex aio true false) ; then:" \
+		-e '/if compile_prog "" "-lcunit" "CUnit" *; *then/'"s::if $(usex test true false) ; then:" \
+		configure || die
+}
+
+src_configure() {
+	chmod g-w "${T}"
+	# not a real configure script
+	# TODO: cuda
+	# TODO: libnbd - not packaged in Gentoo
+	# TODO: pmem - not packaged in Gentoo
+	set -- \
+	./configure \
+		--disable-optimizations \
+		--extra-cflags="${CFLAGS} ${CPPFLAGS}" \
+		--cc="$(tc-getCC)" \
+		--disable-pmem \
+		$(usex curl '' '--disable-http') \
+		$(usex glusterfs '' '--disable-gfapi') \
+		$(usex gtk '--enable-gfio' '') \
+		$(usex io-uring '--enable-libaio-uring' '') \
+		$(usex numa '' '--disable-numa') \
+		$(usex rbd '' '--disable-rbd') \
+		$(usex rdma '' '--disable-rdma') \
+		$(usex static '--build-static' '') \
+		$(usex tcmalloc '' '--disable-tcmalloc')
+	echo "$@"
+	"$@" || die 'configure failed'
+}
+
+src_compile() {
+	emake V=1 OPTFLAGS=
+}
+
+src_install() {
+	emake install DESTDIR="${D}" prefix="${EPREFIX}/usr" mandir="${EPREFIX}/usr/share/man"
+
+	local python2_7_files=(
+		"${ED}"/usr/bin/fiologparser_hist.py
+		"${ED}"/usr/bin/fiologparser.py
+	)
+	local python_files=(
+		"${python2_7_files[@]}"
+		"${ED}"/usr/bin/fio_jsonplus_clat2csv
+	)
+	if use python ; then
+		sed -i 's:python2.7:python:g' "${python2_7_files[@]}" || die
+		python_replicate_script "${python2_7_files[@]}"
+	else
+		rm "${python_files[@]}" || die
+	fi
+
+	local gnuplot_python2_7_files=(
+		"${ED}"/usr/bin/fio2gnuplot
+	)
+	local gnuplot_files=(
+		"${gnuplot_python2_7_files[@]}"
+		"${ED}"/usr/bin/fio_generate_plots
+		"${ED}"/usr/share/man/man1/fio_generate_plots.1
+		"${ED}"/usr/share/man/man1/fio2gnuplot.1
+		"${ED}"/usr/share/fio/*.gpm
+	)
+	if use gnuplot ; then
+		sed -i 's:python2.7:python:g' "${gnuplot_python2_7_files[@]}" || die
+		python_replicate_script "${gnuplot_python2_7_files[@]}"
+	else
+		rm "${gnuplot_files[@]}" || die
+		rmdir "${ED}"/usr/share/fio/ || die
+	fi
+
+	# This tool has security/parallel issues -- it hardcodes /tmp/template.fio.
+	rm "${ED}"/usr/bin/genfio || die
+
+	dodoc README REPORTING-BUGS HOWTO
+	docinto examples
+	dodoc examples/*
+}
diff --git a/sys-block/libzbc/Manifest b/sys-block/libzbc/Manifest
index 0a02341761df..360e78044a89 100644
--- a/sys-block/libzbc/Manifest
+++ b/sys-block/libzbc/Manifest
@@ -1,4 +1,5 @@
+AUX libzbc-5.5.1-gcc-10.patch 2745 BLAKE2B d652144129c02bad8fa39b1587d54726e36c892b124c69084844737aa7604e16a00574569e95e6a0913f43002c4ff7240cbff017440b76842e013fdf25de6172 SHA512 d51a926e6db51df874f6cfdb73a7e85a4dd9a837fef62e6727f5e32b31fde8b9e1a2df0c06cdec0b5a9b53ab275761331566bf73f57811cbf39ebd91ee571212
 AUX libzbc-no-automagic-gtk-dep.patch 976 BLAKE2B 211a33a5eac0239526f050de30187b3392e953a257457de88c47eab39b9db518b2f9f7ea3110f6fd294ed2f54270f9a2cd25cdc38620ce7a62f2e3e68af088a6 SHA512 b1278b7d91bfabb577488016749a69714958601219a47a31794af4a22361a8f2621bdb1a964beaf78d7c73d00f934647a66e90681853abbcb5f8c7e969d981c7
 DIST libzbc-5.5.1.tar.gz 128638 BLAKE2B 3cb636f29ff29bb87c86bd800231a1b45f517822e5785af599a6385705dffa1e90574e4bd2c1b310d5a0dab094cf6e878fc80b6178ea4eb028d5d1d174e7559a SHA512 cb060d06839ea207ed2e32e940348176dd0eff2279cbdb72f565bef177eb4a195feea67c4d1ed5f455e3839475e0f4557a45774129e3d9e009ea38f9134ae159
-EBUILD libzbc-5.5.1.ebuild 635 BLAKE2B 0e2f5d2ad0c2ce0479bccff31bcc92d8514f4d58ab5cab3a46c975f957eeca5f66d20e9ec8e2f115fb6a6cc071bf9ec5ab1dd191b1b343f407d6142f6fc55b25 SHA512 9ba5483efb32d96a8053f99d471a956df60e0c481991f9d61de6df9ab428ef4debff6d48e06a8d5e298c46633cd22777a385512766e44cd973a509c3a85d1d8a
+EBUILD libzbc-5.5.1.ebuild 708 BLAKE2B c842ae5e3128499e11159a560f584d5799e3b297395b39c5acb528863b440f3f1bb13267bebfca9bb05a9b83d6ccd06d892066860f9ad7c2f5e99b11cec8d277 SHA512 2dae1278857df691d8205cd4fb38eaa5b65e30c15a9998d89ca2621cdca56ff4083d696d0cd20b7b13cd61c27a9cae6e840cd7fa9035f49d6e7ac9a8759fa108
 MISC metadata.xml 836 BLAKE2B 360b17822ed9256339bb8a81993814aebd63925acc8b600d75851a2a1834ac6714f84f036882617f789362e06b5b58beec89e2ae5a5b01a88c67b7122311972f SHA512 6a53f78f3fb53d3ac0a97eac47710d5fcdf23db95c98f58ee1c296eef7bbbd218f79cd151eed6424a917ae69775bf2eb42916c7a51c7ac82dffd4e8e5b9ef451
diff --git a/sys-block/libzbc/files/libzbc-5.5.1-gcc-10.patch b/sys-block/libzbc/files/libzbc-5.5.1-gcc-10.patch
new file mode 100644
index 000000000000..78511bf521d2
--- /dev/null
+++ b/sys-block/libzbc/files/libzbc-5.5.1-gcc-10.patch
@@ -0,0 +1,64 @@
+https://github.com/hgst/libzbc/commit/1f3a63432bb5a4ca47a5839181c8f13512848b6c
+https://bugs.gentoo.org/707808
+
+From 1f3a63432bb5a4ca47a5839181c8f13512848b6c Mon Sep 17 00:00:00 2001
+From: Jan Engelhardt <jengelh@inai.de>
+Date: Mon, 16 Mar 2020 08:01:44 +0100
+Subject: [PATCH] build: avoid double definition of zbc_log_drv etc.
+
+When -fno-common is in use, what compiler writers are trying to make
+a standard, libzbc fails to build.
+
+$ make V=1
+Making all in .
+make[1]: Entering directory '~/libzbc'
+/bin/sh ./libtool  --tag=CC   --mode=link gcc  -fPIC -fno-common -O2 -g -pthread -Wl,--version-script,./exports -release '5.8.5'  -o libzbc.la -rpath /usr/lib lib/libzbc_la-zbc.lo lib/libzbc_la-zbc_block.lo lib/libzbc_la-zbc_sg.lo lib/libzbc_la-zbc_scsi.lo lib/libzbc_la-zbc_ata.lo lib/libzbc_la-zbc_fake.lo
+libtool: link: gcc -shared  -fPIC -DPIC  lib/.libs/libzbc_la-zbc.o lib/.libs/libzbc_la-zbc_block.o lib/.libs/libzbc_la-zbc_sg.o lib/.libs/libzbc_la-zbc_scsi.o lib/.libs/libzbc_la-zbc_ata.o lib/.libs/libzbc_la-zbc_fake.o    -O2 -g -pthread -Wl,--version-script -Wl,./exports   -pthread -Wl,-soname -Wl,libzbc-5.8.5.so -o .libs/libzbc-5.8.5.so
+/usr/lib64/gcc/x86_64-suse-linux/9/../../../../x86_64-suse-linux/bin/ld: lib/.libs/libzbc_la-zbc_block.o:~/libzbc/lib/zbc.h:269: multiple definition of `zbc_log_level'; lib/.libs/libzbc_la-zbc.o:~/libzbc/lib/zbc.h:269: first defined here
+/usr/lib64/gcc/x86_64-suse-linux/9/../../../../x86_64-suse-linux/bin/ld: lib/.libs/libzbc_la-zbc_block.o:~/libzbc/lib/zbc.h:195: multiple definition of `zbc_fake_drv'; lib/.libs/libzbc_la-zbc.o:~/libzbc/lib/zbc.h:195: first defined here
+
+References: https://bugzilla.suse.com/show_bug.cgi?id=1160244
+---
+ lib/zbc.h | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/lib/zbc.h b/lib/zbc.h
+index 7dec298..73d76db 100644
+--- a/lib/zbc.h
++++ b/lib/zbc.h
+@@ -177,22 +177,22 @@ static inline void zbc_set_errno(enum zbc_sk sk, enum zbc_asc_ascq asc_ascq)
+ /**
+  * Block device driver (requires kernel support).
+  */
+-struct zbc_drv zbc_block_drv;
++extern struct zbc_drv zbc_block_drv;
+ 
+ /**
+  * ZAC (ATA) device driver (uses SG_IO).
+  */
+-struct zbc_drv zbc_ata_drv;
++extern struct zbc_drv zbc_ata_drv;
+ 
+ /**
+  * ZBC (SCSI) device driver (uses SG_IO).
+  */
+-struct zbc_drv zbc_scsi_drv;
++extern struct zbc_drv zbc_scsi_drv;
+ 
+ /**
+  * ZBC emulation driver (file or block device).
+  */
+-struct zbc_drv zbc_fake_drv;
++extern struct zbc_drv zbc_fake_drv;
+ 
+ #define container_of(ptr, type, member) \
+     ((type *)((char *)(ptr)-(unsigned long)(&((type *)0)->member)))
+@@ -266,7 +266,7 @@ enum {
+ /**
+  * Library log level.
+  */
+-int zbc_log_level;
++extern int zbc_log_level;
+ 
+ #define zbc_print(stream,format,args...)		\
+ 	do {						\
diff --git a/sys-block/libzbc/libzbc-5.5.1.ebuild b/sys-block/libzbc/libzbc-5.5.1.ebuild
index 5c726ff8a47f..df4ed34ffdbf 100644
--- a/sys-block/libzbc/libzbc-5.5.1.ebuild
+++ b/sys-block/libzbc/libzbc-5.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/hgst/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2 GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="gtk"
 
 DEPEND="virtual/pkgconfig
@@ -20,6 +20,7 @@ DEPEND="virtual/pkgconfig
 
 PATCHES=(
 	"${FILESDIR}/libzbc-no-automagic-gtk-dep.patch"
+	"${FILESDIR}/${P}-gcc-10.patch"
 )
 
 src_prepare() {
diff --git a/sys-block/mbuffer/Manifest b/sys-block/mbuffer/Manifest
index 5e0d8aa21e91..bef93e8485af 100644
--- a/sys-block/mbuffer/Manifest
+++ b/sys-block/mbuffer/Manifest
@@ -1,6 +1,5 @@
 AUX mbuffer-20180410-sysconfdir.patch 897 BLAKE2B 1fc57be6f5ce11f483d43dc69c9e4120b09a4c59caaee90deefd5500058ea0c8b9cd6b9b3dea1a2f21733acf4eb8a922171d791e57d658275997ca951f73559e SHA512 36964604338a0bfd0e9cb55d17b307f32dfe09d280019e8083e5909b81e091887bb8f360ef9aebf21eb8448a3d9ba305a6f7a7bc35ea4884418bb7d67e9fadb0
-DIST mbuffer-20191016.tgz 145508 BLAKE2B d69600544fc0ed9e619f07f552a5369aed24f8a93588edd2a205613bdf5ebd5c636cda24702149bf7a82605c9a956408b56555c1577eb83c8f8ca0eb49c5c14c SHA512 78142a3f1529609b12151aafe848ad768a6074f4891bedaa52cc46ffa14350a2a8c0362d02621fa227bda54e98eabc4970c00838114574540873b426fbfe97a5
+AUX mbuffer-20200505-find-OBJDUMP.patch 377 BLAKE2B 7b9d8660d85532a5dff19195ab884fa37155ec603b414e576766c593295388c7f3ac2c3f6e333dbb5dbdf794036aedc814435b35bf746b10a5a0575905bcdbfb SHA512 4228741aeece32872c11da8a6840d8a7de6db77d4663edb44a8875384c70ba0807929bbb70c397f870ea1c18c5d0c0a224ad90f3d4e7094246496b461a5e6bff
 DIST mbuffer-20200505.tgz 146020 BLAKE2B b85742f710405e29775c7d25e9c1be733fd94d7157018017b7c8fb5b5cdeab7fa8819b024d297d96af960a73a8982fdeaefe50627c605f797df4d75b0c15435f SHA512 8a1e5721869fd705d02486cf93467bfe0a59b58789826ca337c18a023e9fbb18c1651211bfebdea4cdd45772ad23d0715bb3892bed04ce66f5fbe72406cde9f7
-EBUILD mbuffer-20191016.ebuild 1497 BLAKE2B 073e82a8ee1138b306d37dd63c3047df020d91eb90264276e01c845a9001b3c4d951a31d02771205864576529abb41c5dcf7d53c588fd07eb2b19ee03a08e48c SHA512 e9477f102d2da811a19736832b904ba65645fff2f2a1f28220e04e79f13abd052159a97b3e0014d075941e4bda2d7f6bfdeaaecb4aaebedaa34caab9e03649e5
-EBUILD mbuffer-20200505.ebuild 1501 BLAKE2B c5f87a3fe6fc28352c732fa9f95d0e91601a41030e8085da1fb7bd29a2ec62dd895b7dc92594d358234b0d843e29b89c483982c6328ec682e126f30990a953cd SHA512 b3f83676d9eaf44c2bd7ee24b0930ebbaf98501a4f66bbf370f233cf360e706cc7049d04f96a461acece024ab0c4ab344f4b92245ec1c6fe0a2b6734e5057a34
+EBUILD mbuffer-20200505.ebuild 1580 BLAKE2B 7d4d32ea78865d3fe29f94f77e2c2228814b37587bf97ceea6010ef0c99da441bba41344c2b5c4ba38cba7eb64a3e803a5f48ad4785d4bbac858db75fc891352 SHA512 eac277d0ec3650f05087ba0c3e50b15e088eda8c7de182d40334318c44cf54e895c8885bd3a42473cceb31882dbf5ec57f8792ce23c69ca8fe64f18f504dca6d
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-block/mbuffer/files/mbuffer-20200505-find-OBJDUMP.patch b/sys-block/mbuffer/files/mbuffer-20200505-find-OBJDUMP.patch
new file mode 100644
index 000000000000..93fe6265e2ae
--- /dev/null
+++ b/sys-block/mbuffer/files/mbuffer-20200505-find-OBJDUMP.patch
@@ -0,0 +1,11 @@
+--- a/configure.in
++++ b/configure.in
+@@ -109,7 +109,7 @@ AC_PATH_PROG(CP,cp)
+ AC_PATH_PROG(MT,mt,AC_MSG_WARN(could not find the program mt - you might need this if you want autoloader support))
+ AC_PATH_PROGS(TAR,[gtar tar])
+ AC_PATH_PROG(AWK,awk)
+-AC_PATH_PROGS(OBJDUMP,objdump gobjdump)
++AC_CHECK_TOOLS(OBJDUMP, [gobjdump objdump])
+ AC_SYS_LARGEFILE
+ AC_STRUCT_ST_BLKSIZE
+ 
diff --git a/sys-block/mbuffer/mbuffer-20191016.ebuild b/sys-block/mbuffer/mbuffer-20191016.ebuild
deleted file mode 100644
index a1a48e24a58a..000000000000
--- a/sys-block/mbuffer/mbuffer-20191016.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 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-3"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ppc x86"
-IUSE="debug ssl test"
-
-REQUIRED_USE="test? ( ssl )"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="ssl? ( dev-libs/openssl:0= )"
-DEPEND="${RDEPEND}
-	test? ( dev-libs/openssl:0 )"
-
-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/mbuffer/mbuffer-20200505.ebuild b/sys-block/mbuffer/mbuffer-20200505.ebuild
index 5dd75f36ff0b..3f4bfb12c78d 100644
--- a/sys-block/mbuffer/mbuffer-20200505.ebuild
+++ b/sys-block/mbuffer/mbuffer-20200505.ebuild
@@ -11,19 +11,22 @@ SRC_URI="https://www.maier-komor.de/software/mbuffer/${P}.tgz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
-IUSE="debug ssl test"
+KEYWORDS="amd64 arm ~arm64 ppc x86"
+IUSE="debug libressl ssl test"
 
 REQUIRED_USE="test? ( ssl )"
 
 RESTRICT="!test? ( test )"
 
-RDEPEND="ssl? ( dev-libs/openssl:0= )"
-DEPEND="${RDEPEND}
-	test? ( dev-libs/openssl:0 )"
+RDEPEND="ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)"
+DEPEND="${RDEPEND}"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-20180410-sysconfdir.patch"
+	"${FILESDIR}/${PN}-20200505-find-OBJDUMP.patch"
 )
 
 src_prepare() {
diff --git a/sys-block/ms-sys/Manifest b/sys-block/ms-sys/Manifest
index 87e61350647d..3769e66d97f5 100644
--- a/sys-block/ms-sys/Manifest
+++ b/sys-block/ms-sys/Manifest
@@ -1,5 +1,7 @@
 DIST ms-sys-2.5.3.tar.gz 76192 BLAKE2B c1046fa346088bb9abd39c8140479e11525fd1965fffebc0ca6ed8da354e354af6946f4bfd2a68ddca1f0b1bbb02ff94216d763a12f4ca43de0cd9ba1aa4d877 SHA512 18080bef903c68b6032e04124f3b3b9f0eb58517b338c6bd795846d786ee0af6b65760166b591090ad865a08a03346675f3c34ce59c64215059dac1439b558d8
 DIST ms-sys-2.6.0.tar.gz 75349 BLAKE2B b3c1cced0c22507c2e8c3a8d0ac9fcaf8fc6d31373b90a77f78a7a9ca7602e88f747e3fd436370ab0b2eb23b2ea964200651f68eccb9807beef1b3f696088739 SHA512 f49790813712b9fd9f63273a7571edbdacb855d93d26dfe1da94d35b656c0ec0574ec43b3cad0f363fa4ec18bd29b81a440d592dc8148b15b18bb8a28c35fbbe
+DIST ms-sys-2.7.0.tar.gz 85195 BLAKE2B ae1b6de38bb4ac275f971c7dfbbdc5d32a645ffc0c32a6fa82f6673fa8788f1a328d9609c2e82812fc74b9c94ea980f257297e67b7fb9536c9d42c0fabc26f8f SHA512 d9828c86a5b316cadcc712ea029bcf7322f89ab31424982fe2a7e23cdb2334a5d076c2b58299f1f312b0d4b4c869a3d7ffadf236230344bc2e7b4a72c668510e
 EBUILD ms-sys-2.5.3.ebuild 671 BLAKE2B e092cb6e2d4ccbe1a36740e5982c442672e7bb39c6a2404f976635d24b76241fa71bc93112afd79d424fec257e1493f2ef9f0f93712cede569f63b41fdde102f SHA512 7fbc604a03ddffd88223b99c1914bd122616f0d66069e0349f75e2c1ade798ae683c1de748bae35c5fb4d3be19e50b17a9bba47a060d4ced6b29f78123e2ee0f
 EBUILD ms-sys-2.6.0.ebuild 778 BLAKE2B 710d5037fbfe0efe43283aedc21f6531242546d4ea2e9ef998f195e273aadbbabaaed365949c6ce5edb738f17730a5b5f08ce12842ab9c83fa4c9074596b8d4e SHA512 36f315adc4234559216df4a4a1f14e9abfe91a2dfb9beff29c67cd80c77addbf9bd49871b7036531368ad0938be4216d1f6edff4d92a2175ca65e68fa5c30127
+EBUILD ms-sys-2.7.0.ebuild 788 BLAKE2B e123725ce7a8efa6bd2ee80f45c3d679cdc43f6a737b386e0ff7792488487ec866b6507624230e0ed46dac919774e9e12e88477f3f0da038d5f5c09e733e975d SHA512 26fe20c0b50e2ec38388dc34f7845b97eed6d038c0a0551df6115abeb0b71ae293293fa990dcad956989813ad18bfd6f214c821b53605d63b29e2eca4d9ca8a6
 MISC metadata.xml 303 BLAKE2B efd83ecd89e4afa7f5254e7fdafcf22883a2293264393af9f20bc1462db09792a97044cb09444331db5fb83f3ee1f9d9fea27fd702a11e7e0732f076f35c966d SHA512 42ef32f756ed48890908bbb142342bfc2b3a1e46c9d8aef7118d0d486d5143d1d43cea0a96f6d0d1ec59bb346d98191032a0f6e12dd0f1f3a1c8930f321b3c56
diff --git a/sys-block/ms-sys/ms-sys-2.7.0.ebuild b/sys-block/ms-sys/ms-sys-2.7.0.ebuild
new file mode 100644
index 000000000000..8a930f3fd808
--- /dev/null
+++ b/sys-block/ms-sys/ms-sys-2.7.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="A command-line program for writing Microsoft compatible boot records"
+HOMEPAGE="http://ms-sys.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="sys-devel/gettext"
+RDEPEND="virtual/libintl"
+
+src_prepare() {
+	default
+	# don't compress man-pages by default
+	sed '/gzip --no-name -f/d' -i Makefile || die
+}
+
+src_compile() {
+	tc-export CC
+	default
+}
+
+src_install() {
+	local nls=""
+	if ! has sv ${LINGUAS-sv} ; then
+		nls='NLS_FILES='
+	fi
+
+	emake DESTDIR="${D}" MANDIR="/usr/share/man" \
+		PREFIX="/usr" ${nls} install
+
+	dodoc CHANGELOG CONTRIBUTORS FAQ README TODO
+}
diff --git a/sys-block/open-iscsi/Manifest b/sys-block/open-iscsi/Manifest
index e541b86bb221..27aef6285a79 100644
--- a/sys-block/open-iscsi/Manifest
+++ b/sys-block/open-iscsi/Manifest
@@ -9,17 +9,13 @@ AUX open-iscsi-2.0.874-Makefiles.patch 4087 BLAKE2B cba133471f1c22987cd8be4e7ea4
 AUX open-iscsi-2.0.874-musl-ethtool-compat.patch 2230 BLAKE2B fada90cbf8173364b795be4756805ac0ae45575b785796d6aec9eb6781003974b0d4450e758d42e45778672ba053122b533d8e56bb9c8db1fbf31aa7e8bfe6dc SHA512 09a3b828773e0d7c5d98f8ba8c0683bd1ef5fd83860fafaa75d89cce9e09cebc68bfaea62091aeadeb1d1adfe5318c0af9bfa0a74f2d802568abe1a59b4ebf03
 AUX open-iscsi-2.0.874-musl-fixes.patch 1478 BLAKE2B a58a8eec59c7dd05e121ab8213dad21d21cb33c91e8b4763816ce6fccc8f9d8f57d9e7bd246e3417e78da0ce61cade5a29433b2b44d025875cd2199dee2e6353 SHA512 264313bc8de01bcad1db858c0b99ca2c294c22eb1b2693e0445083a895afd0cdc9178ff2dad5de18628a6e61723ad5d2e0c0d4789ce07ccae131f575747aa382
 AUX open-iscsi-2.0.875-include-sysmacros.patch 603 BLAKE2B 9c3fcf3bfd0a2ee04c31dd01dbb50680bc9bb434523f0e298d55b762be11f0cd4ef5c7b254466859f755f9e733e8ceaa54795f7dc57518c5136be5ff8001cffe SHA512 686698edc063fbdc47f07dea76ef95e8ae1038eeb3f012f4b6bc098cb0740e9988fc45779e921f4f01ef418d505f194c427308927c67d7af06e03e12b1ae9064
-AUX open-iscsi-2.0.876-Makefiles.patch 1416 BLAKE2B e953a6b5b802feae3068322782f3cd278c878814100fb37bee81400bed76096f08d01575e42d71538ae76086261dccc65104e3df19f3e36e3e660726cdbd3ec5 SHA512 f6038dc8c8d2a31528844f348bc8144616b69bf97f01986a4481b3a81de4bc896204a48c290f8b156d1e85ffd792439251fd52a498d053ed84d21d8b07d1d240
-AUX open-iscsi-2.0.878-gcc10-fno-common.patch 3038 BLAKE2B 9c188ff87e2a4fd418b39380f9b2886ead9be419c1141936b23238559fed82fa90d16f8ecb8f8e191facecd8338a85861968af2bde7d0116ac0e88c0a15ad69d SHA512 1765b2cce24c45f4c151e6ae38a323837074b3a42611e37c63ac36c3b75464ae391dafccc0627a9a063955a86604da8204ecc0aa6241db82246b4757005b9261
 AUX open-iscsi-2.1.1-Makefiles.patch 2185 BLAKE2B ab4dc518f12f0975cf472c94dfa883e98dcce57b2d203c39730ee67c4e6b548ff6554dd4ec8ffd7a624aca99e38c88284ea1bd41cbf89f077e5017e4bc45fd5a SHA512 1b37cfde4889d2f00f91cd173cb323fcb131040ac14351bb66aa4b8250cb527334e869faac4b0fa1ee9160ed7f44ffe2c9cd9a78075d3fec2ca32e0c27c0ba4b
 DIST open-iscsi-2.0-873.tar.gz 667069 BLAKE2B edb427f8483c31499cdde644bbf8d658952952fa8d52a232537e7e6ec71d2d237dcd4e8759de21b65cac757678c7d71c22bd2fe71ed1e7ac152ae8396f080061 SHA512 4e67116cb7dd49381c9279645e5a661f05596ae6be3b832772089828b3764ca2d04b5dea1bcc337071efb52c3c75a6fb943136c659ee59500f3a198ed0dcea6b
 DIST open-iscsi-2.0.875.tar.gz 635121 BLAKE2B 34a7083087c53ed0e59d293d26efe166b09c5ea18b6022869cc9ff3d2edb2fb8b69e2c1ce6c9011bd20fc590b02dafd6d7c13d8bfa1eae6408c4bace13992e5e SHA512 1709011d7d12d3dd9278a0d775af064d5f7da37357f35d6d5c5b3aa8ec16385c28b201b1261f4581dbbbbca3d815015ed8696e1694aa19f3231132f90d1e5b36
-DIST open-iscsi-2.0.878.tar.gz 607489 BLAKE2B f08f7a49dee6a377aed1d5efba100c4c357e95683e841e3c7960a49a40601cf8047dd28403866d963ef6850eb23c03ac39e0861575e21c452190a20534cbec48 SHA512 2eb26e5e69b88614d9b6262fffce94b93f9afc0742415ad6c2505daacd3014cd9d73bd89c36f452d004e2c4f312f372aab1ddc55e1bdec73c58de60181d73b33
-DIST open-iscsi-2.1.0.tar.gz 604689 BLAKE2B 1741f4ac5072e3e952ba8268b1f52c6d296156b4c2696efad9fd0ccfe54870f74ac54b21144e4e71eed03cf8674a6aff96eee4f72f8a608fde40dc463f962b6f SHA512 bb1a4ff2bab0562bfd4281d757dd888e8f5d2d1ae16561cabf5598073c343e8c2dc9b35992c2bc51398faffceb9b70ea2eae214ab205a586bcb971d741d5f59d
 DIST open-iscsi-2.1.1.tar.gz 616859 BLAKE2B 7004b0866e55837f06cfe9e45f49f6a482932fda8a2c21c55819d658fb96113f1913290d490f28baccea86ceb755c63b73bd010b201f974c9803d39fbf5d0672 SHA512 88dbea433fe5266714c5c73ce4b60dfb8ddeffcaad4ff77abbdda2a865d29d4307ca51b8f45376f54542b19baed30d5f2f1836a8c136eb0af840f489f47e4fb3
+DIST open-iscsi-2.1.2.tar.gz 617407 BLAKE2B 13a8c70d8a4618262c746cce3f2c66c04b577b35918d993c29fff041d292ef9e60b4d39c6d6a308d306b8303d08e7aac81b9927157361eaf47e694e9ae1e365a SHA512 a0b1fc4aa2acadbf3a69fa636a47fec527fff75748fccfa83c9540f3ac05c71835a406503b15480ed25fe4fb780e58e0dd21760cccc7f7ef07128d1aef8ee2e3
 EBUILD open-iscsi-2.0.873-r1.ebuild 2545 BLAKE2B c6b89937392718933e75616429acab05e7be548457b9aadaa1be77863dc8ed66e3acbaf482a320479b9c7f73507425615af86839209e2e956e08a12061097a41 SHA512 11de4116925ebe35a63ee19bb49a87bccff3c2648f3ea94ea05726d48cb0fe950a3aae9420b697c51f9f1387cea9075dfbffbeae7ca20af1e411769c34610339
-EBUILD open-iscsi-2.0.875.ebuild 3714 BLAKE2B 4d50d94574f3e16ef32a94287048719d83085457b66157ab402bc4c1b8674575910a3275baeef1cd462e8b6cdfa8efd37acb55dcac08e0d47a130d7fea6e2603 SHA512 e82f636a9c91d8dce36d248de9f2e2123505435dd15f1ac9273ccf6628641e8809ff9fd6cfd8b037b88699641e49170d145b2d8fa349156ff6aad2d833cba6a9
-EBUILD open-iscsi-2.0.878-r1.ebuild 4048 BLAKE2B ef4daf567e9936937252187c1a4f244c0dec0b0d673eac0a3e743dabf99efced2fb3d3c095395cf81515e406b88cf387c202d80206917e8a80c68a65965582af SHA512 9356340d8bb850ff8a62a4f68c3174499cc9df6924f9496598bc50826983eecc5ca8381176d3f1b1e02a37aedd61ebae0b80935c97d124868e0c5c034b3bb59f
-EBUILD open-iscsi-2.1.0.ebuild 3996 BLAKE2B 9bd9e7b64838e3e3e02f0e7fc00706f580687db254bde71c89aa547050025ed1c7d2d10b8f3727d091adf051cc3f73eea456fea28c5bb92c5b11feda56590ee1 SHA512 3da8ce679baa5a0adcf65b553f65cbbe6d22970c409c02bf0f25f8b9bb4b4c9cbda3aaafd85d38289ef437fb08cb53cec83ecdd2634889769e47c852835d1b2d
+EBUILD open-iscsi-2.0.875.ebuild 3710 BLAKE2B 19bdadc17ba56edadb5ff18eaf00e08ef71fb4baef0cfaed73355bf09b2c4311f8cb9d99f9220ddcb14bdcbce0a1dc782ef895916f19d06c0fbc1f5297115974 SHA512 dbedc69c799eb9172d7c150102a58b79bfa1a40c5841a05819339c866204503a70f3482701b2faf667f07dcda6c2d4275f4b2c5a6c0f3009755a86d5951f4bf2
 EBUILD open-iscsi-2.1.1.ebuild 4033 BLAKE2B c52114f0167c8cf3ada73ce1dfe8c3c8d9db2859154a7d496ab8e11c176c809f8515fcc8ee21118ebb76e1b049f52410179de2a4f16011cb1725ffca321d9f8f SHA512 d515ce74e88cb35fa3982e45ae27fd5656fe5503c783f36ba27b7ca1d3d0b2d60aef3ecdd0b02c407b1913a87b8514a6be1ac491b7c0a3cb4866e734b561d08c
+EBUILD open-iscsi-2.1.2.ebuild 4033 BLAKE2B c52114f0167c8cf3ada73ce1dfe8c3c8d9db2859154a7d496ab8e11c176c809f8515fcc8ee21118ebb76e1b049f52410179de2a4f16011cb1725ffca321d9f8f SHA512 d515ce74e88cb35fa3982e45ae27fd5656fe5503c783f36ba27b7ca1d3d0b2d60aef3ecdd0b02c407b1913a87b8514a6be1ac491b7c0a3cb4866e734b561d08c
 MISC metadata.xml 458 BLAKE2B 34a2a9b03797454b48ace319f383d85da5f9fe0f14afa1f1da1dc9afc535a2e1aeddaea0df27811b77fd3099b5754ee0755d49491157ed1e141fc2078c258389 SHA512 bd5e104acd3e07b8965b4eacb7b397b75448fc31b7359f17ee4e24af18fcd00ecd0c64001d42b7a542790151678b9dd02bad9513a69986c60cf91cceebfe86c3
diff --git a/sys-block/open-iscsi/files/open-iscsi-2.0.876-Makefiles.patch b/sys-block/open-iscsi/files/open-iscsi-2.0.876-Makefiles.patch
deleted file mode 100644
index 2cfa43622853..000000000000
--- a/sys-block/open-iscsi/files/open-iscsi-2.0.876-Makefiles.patch
+++ /dev/null
@@ -1,61 +0,0 @@
---- a/usr/Makefile
-+++ b/usr/Makefile
-@@ -69,9 +69,9 @@ iscsistart: $(ISCSI_LIB_SRCS) $(INITIATOR_SRCS) $(FW_BOOT_SRCS) \
- 		iscsistart.o statics.o
- 	$(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ -lrt $(ISCSI_LIB)
- clean:
--	rm -f *.o $(PROGRAMS) .depend $(LIBSYS)
-+	$(RM) *.o $(PROGRAMS) .depend $(LIBSYS)
- 
- depend:
--	gcc $(CFLAGS) -M `ls *.c` > .depend
-+	$(CC) $(CFLAGS) -M `ls *.c` > .depend
- 
- -include .depend
---- a/utils/Makefile
-+++ b/utils/Makefile
-@@ -10,9 +10,9 @@ iscsi-iname: md5.o iscsi-iname.o
- 	$(CC) $(CFLAGS) $(LDFLAGS) $^ $(DBM_LIB) -o $@
- 
- clean:
--	rm -f *.o $(PROGRAMS) .depend
-+	$(RM) *.o $(PROGRAMS) .depend
- 
- depend:
--	gcc $(CFLAGS) -M `ls *.c` > .depend
-+	$(CC) $(CFLAGS) -M `ls *.c` > .depend
- 
- -include .depend
---- a/utils/fwparam_ibft/Makefile
-+++ b/utils/fwparam_ibft/Makefile
-@@ -41,11 +41,11 @@ LDFLAGS += -L$(TOPDIR)/libopeniscsiusr -liscsiusr
- all: $(OBJS)
- 
- clean:
--	rm -f *.o $(CLEANFILES) .depend
-+	$(RM) *.o $(CLEANFILES) .depend
- 
- $(OBJS): prom_parse.tab.h prom_parse.h fwparam_ibft.h
- 
- depend:
--	gcc $(CFLAGS) -M `ls *.c` > .depend
-+	$(CC) $(CFLAGS) -M `ls *.c` > .depend
- 
- -include .depend
---- a/utils/sysdeps/Makefile
-+++ b/utils/sysdeps/Makefile
-@@ -8,9 +8,9 @@ SYSDEPS_OBJS=sysdeps.o
- all: $(SYSDEPS_OBJS)
- 
- clean:
--	rm -f *.o .depend
-+	$(RM) *.o .depend
- 
- depend:
--	gcc $(CFLAGS) -M `ls *.c` > .depend
-+	$(CC) $(CFLAGS) -M `ls *.c` > .depend
- 
- -include .depend
--- 
-2.16.2
-
diff --git a/sys-block/open-iscsi/files/open-iscsi-2.0.878-gcc10-fno-common.patch b/sys-block/open-iscsi/files/open-iscsi-2.0.878-gcc10-fno-common.patch
deleted file mode 100644
index b61476555fb4..000000000000
--- a/sys-block/open-iscsi/files/open-iscsi-2.0.878-gcc10-fno-common.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-From 499a006a7d6bb154f9e1ab430e4c9e231ba6096a Mon Sep 17 00:00:00 2001
-From: Lee Duncan <lduncan@suse.com>
-Date: Tue, 28 Jan 2020 16:36:56 -0800
-Subject: [PATCH] Updates to support gcc -fno-common option.
-
-This meant cleaning up the definition of some
-global variables, so that they were only defined
-in one place and refered to as external elsewhere.
----
- include/iscsi_err.h    | 6 ++++--
- iscsiuio/configure.ac  | 2 +-
- iscsiuio/src/uip/uip.h | 4 ++--
- usr/iscsi_err.c        | 2 ++
- usr/log.c              | 1 +
- usr/log.h              | 2 +-
- 6 files changed, 11 insertions(+), 6 deletions(-)
-
-diff --git a/include/iscsi_err.h b/include/iscsi_err.h
-index ed000dd0..04a8723e 100644
---- a/include/iscsi_err.h
-+++ b/include/iscsi_err.h
-@@ -4,7 +4,7 @@
- #ifndef _ISCSI_ERR_
- #define _ISCSI_ERR_
- 
--enum {
-+enum iscsi_error_list {
- 	ISCSI_SUCCESS			= 0,
- 	/* Generic error */
- 	ISCSI_ERR			= 1,
-@@ -73,7 +73,9 @@ enum {
- 
- 	/* Always last. Indicates end of error code space */
- 	ISCSI_MAX_ERR_VAL,
--} iscsi_err;
-+};
-+
-+extern enum iscsi_error_list iscsi_err;
- 
- extern void iscsi_err_print_msg(int err);
- extern char *iscsi_err_to_str(int err);
-diff --git a/iscsiuio/configure.ac b/iscsiuio/configure.ac
-index b41df0ec..8099f09c 100644
---- a/iscsiuio/configure.ac
-+++ b/iscsiuio/configure.ac
-@@ -78,7 +78,7 @@ AC_CONFIG_COMMANDS([default],[[
-     else
-         echo 'char *build_date = "'`date`'";' > src/unix/build_date.c
-     fi
--    echo 'char *build_date;'> src/unix/build_date.h
-+    echo 'extern char *build_date;'> src/unix/build_date.h
- ]],[[]])
- 
- AC_PREFIX_DEFAULT()
-diff --git a/iscsiuio/src/uip/uip.h b/iscsiuio/src/uip/uip.h
-index 1180ab50..9d9428a2 100644
---- a/iscsiuio/src/uip/uip.h
-+++ b/iscsiuio/src/uip/uip.h
-@@ -70,8 +70,8 @@ struct uip_stack;
- typedef u16_t uip_ip4addr_t[2];
- typedef u16_t uip_ip6addr_t[8];
- 
--const uip_ip6addr_t all_zeroes_addr6;
--const uip_ip4addr_t all_zeroes_addr4;
-+extern const uip_ip6addr_t all_zeroes_addr6;
-+extern const uip_ip4addr_t all_zeroes_addr4;
- 
- #define ETH_BUF(buf) ((struct uip_eth_hdr *)buf)
- #define VLAN_ETH_BUF(buf) ((struct uip_vlan_eth_hdr *)buf)
-diff --git a/usr/iscsi_err.c b/usr/iscsi_err.c
-index 23c61fc3..4a057d57 100644
---- a/usr/iscsi_err.c
-+++ b/usr/iscsi_err.c
-@@ -21,6 +21,8 @@
- #include "iscsi_err.h"
- #include "log.h"
- 
-+enum iscsi_error_list iscsi_err;
-+
- static char *iscsi_err_msgs[] = {
- 	/* 0 */ "",
- 	/* 1 */ "unknown error",
-diff --git a/usr/log.c b/usr/log.c
-index f29b54b3..6e16e7ce 100644
---- a/usr/log.c
-+++ b/usr/log.c
-@@ -33,6 +33,7 @@
- 
- char *log_name;
- int log_level = 0;
-+struct logarea *la = NULL;
- 
- static int log_stop_daemon = 0;
- static void (*log_func)(int prio, void *priv, const char *fmt, va_list ap);
-diff --git a/usr/log.h b/usr/log.h
-index 486a08ea..c548791e 100644
---- a/usr/log.h
-+++ b/usr/log.h
-@@ -64,7 +64,7 @@ struct logarea {
- 	union semun semarg;
- };
- 
--struct logarea *la;
-+extern struct logarea *la;
- 
- extern int log_init(char *program_name, int size,
- 	void (*func)(int prio, void *priv, const char *fmt, va_list ap),
diff --git a/sys-block/open-iscsi/open-iscsi-2.0.875.ebuild b/sys-block/open-iscsi/open-iscsi-2.0.875.ebuild
index dcb2eadf66ab..a72a670d11f1 100644
--- a/sys-block/open-iscsi/open-iscsi-2.0.875.ebuild
+++ b/sys-block/open-iscsi/open-iscsi-2.0.875.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc ~x86"
 IUSE="debug infiniband +tcp rdma"
 
 DEPEND="sys-block/open-isns:=
diff --git a/sys-block/open-iscsi/open-iscsi-2.1.0.ebuild b/sys-block/open-iscsi/open-iscsi-2.1.0.ebuild
deleted file mode 100644
index a1f80e0a3472..000000000000
--- a/sys-block/open-iscsi/open-iscsi-2.1.0.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools linux-info flag-o-matic toolchain-funcs udev systemd
-
-DESCRIPTION="A performant, transport independent, multi-platform implementation of RFC3720"
-HOMEPAGE="http://www.open-iscsi.com/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/0.2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug infiniband libressl +tcp rdma systemd"
-
-DEPEND="
-	sys-apps/kmod
-	sys-block/open-isns:=
-	sys-kernel/linux-headers
-	infiniband? ( sys-fabric/ofed )
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	systemd? ( sys-apps/systemd )
-"
-RDEPEND="${DEPEND}
-	sys-fs/lsscsi
-	sys-apps/util-linux"
-BDEPEND="virtual/pkgconfig"
-
-REQUIRED_USE="infiniband? ( rdma ) || ( rdma tcp )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.0.876-Makefiles.patch"
-)
-
-pkg_setup() {
-	linux-info_pkg_setup
-
-	if kernel_is -lt 2 6 16; then
-		die "Sorry, your kernel must be 2.6.16-rc5 or newer!"
-	fi
-
-	# Needs to be done, as iscsid currently only starts, when having the iSCSI
-	# support loaded as module. Kernel builtin options don't work. See this for
-	# more information:
-	# https://groups.google.com/group/open-iscsi/browse_thread/thread/cc10498655b40507/fd6a4ba0c8e91966
-	# If there's a new release, check whether this is still valid!
-	TCP_MODULES="SCSI_ISCSI_ATTRS ISCSI_TCP"
-	RDMA_MODULES="INFINIBAND_ISER"
-	INFINIBAND_MODULES="INFINIBAND_IPOIB INIBAND_USER_MAD INFINIBAND_USER_ACCESS"
-	CONFIG_CHECK_MODULES="tcp? ( ${TCP_MODULES} ) rdma? ( ${RDMA_MODULES} ) infiniband? ( ${INFINIBAND_MODULES} )"
-	if linux_config_exists; then
-		if use tcp; then
-			for module in ${TCP_MODULES}; do
-				linux_chkconfig_module ${module} || ewarn "${module} needs to be built as module (builtin doesn't work)"
-		done
-		fi
-		if use infiniband; then
-			for module in ${INFINIBAND_MODULES}; do
-				linux_chkconfig_module ${module} || ewarn "${module} needs to be built as module (builtin doesn't work)"
-		done
-		fi
-		if use rdma; then
-			for module in ${RDMA_MODULES}; do
-				linux_chkconfig_module ${module} || ewarn "${module} needs to be built as module (builtin doesn't work)"$
-			done
-		fi
-	fi
-}
-
-src_prepare() {
-	sed -e 's:^\(iscsid.startup\)\s*=.*:\1 = /usr/sbin/iscsid:' \
-		-i etc/iscsid.conf || die
-	sed -e 's@\(/sbin/\)@/usr\1@' \
-		-i etc/systemd/iscsi* || die
-	default
-
-	pushd iscsiuio >/dev/null || die
-	eautoreconf
-	popd >/dev/null || die
-}
-
-src_configure() {
-	use debug && append-cppflags -DDEBUG_TCP -DDEBUG_SCSI
-	append-lfs-flags
-}
-
-src_compile() {
-	# Stuffing CPPFLAGS into CFLAGS isn't entirely correct, but the build
-	# is messed up already here, so it's not making it that much worse.
-	KSRC="${KV_DIR}" CFLAGS="" \
-	emake \
-		OPTFLAGS="${CFLAGS} ${CPPFLAGS} $(usex systemd '' -DNO_SYSTEMD)" \
-		AR="$(tc-getAR)" CC="$(tc-getCC)" \
-		$(usex systemd '' NO_SYSTEMD=1) \
-		user
-}
-
-src_install() {
-	emake DESTDIR="${ED}" sbindir="/usr/sbin" install
-	# Upstream make is not deterministic, per bug #601514
-	rm -f "${ED}"/etc/initiatorname.iscsi
-
-	dodoc README THANKS
-
-	docinto test/
-	dodoc test/*
-
-	insinto /etc/iscsi
-	newins "${FILESDIR}"/initiatorname.iscsi initiatorname.iscsi.example
-
-	newconfd "${FILESDIR}"/iscsid-conf.d iscsid
-	newinitd "${FILESDIR}"/iscsid-init.d iscsid
-
-	local unit
-	local units=(
-		iscsi.service
-		iscsid.{service,socket}
-		iscsiuio.{service,socket}
-	)
-	for unit in ${units[@]} ; do
-		systemd_dounit etc/systemd/${unit}
-	done
-
-	keepdir /var/db/iscsi
-	fperms 700 /var/db/iscsi
-	fperms 600 /etc/iscsi/iscsid.conf
-}
-
-pkg_postinst() {
-	in='/etc/iscsi/initiatorname.iscsi'
-	if [[ ! -f "${EROOT}${in}" ]] && [[ -f "${EROOT}${in}.example" ]] ; then
-		{
-		  cat "${EROOT}${in}.example"
-		  echo "# InitiatorName generated by ${CATEGORY}/${PF} at $(date -uR)"
-		  echo "InitiatorName=$(${ROOT}/usr/sbin/iscsi-iname)"
-		} >> "${EROOT}${in}.tmp" && mv -f "${EROOT}${in}.tmp" "${EROOT}${in}"
-	fi
-}
diff --git a/sys-block/open-iscsi/open-iscsi-2.0.878-r1.ebuild b/sys-block/open-iscsi/open-iscsi-2.1.2.ebuild
index a622e3b62f5b..d7ff6b52509f 100644
--- a/sys-block/open-iscsi/open-iscsi-2.0.878-r1.ebuild
+++ b/sys-block/open-iscsi/open-iscsi-2.1.2.ebuild
@@ -31,8 +31,7 @@ BDEPEND="virtual/pkgconfig"
 REQUIRED_USE="infiniband? ( rdma ) || ( rdma tcp )"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-2.0.876-Makefiles.patch"
-	"${FILESDIR}/${PN}-2.0.878-gcc10-fno-common.patch"
+	"${FILESDIR}/${PN}-2.1.1-Makefiles.patch"
 )
 
 pkg_setup() {
@@ -106,7 +105,7 @@ src_install() {
 	dodoc README THANKS
 
 	docinto test/
-	dodoc test/*
+	dodoc $(find test -maxdepth 1 -type f ! -name ".*")
 
 	insinto /etc/iscsi
 	newins "${FILESDIR}"/initiatorname.iscsi initiatorname.iscsi.example
diff --git a/sys-block/open-isns/Manifest b/sys-block/open-isns/Manifest
index f13b4fda399b..d342e8ec2ab1 100644
--- a/sys-block/open-isns/Manifest
+++ b/sys-block/open-isns/Manifest
@@ -4,6 +4,6 @@ DIST open-isns-0.100.tar.gz 300611 BLAKE2B a40e8d2bd6e5ac8ed8475d3d50ed625687113
 DIST open-isns-0.98.tar.gz 278410 BLAKE2B f90df85de4d5fd2abdcd267e3c873dff62fcac523ee280e21def057eca366bbba21c2b3bfbf5cc0798b8d0f3b0d5028ebb49000cccc850abdfb85142a7b66c34 SHA512 04263b9ace9d272f4e3776c4e1a034815475590d4b4864217a6200fcd5baea391cd788723db3c17fe0d764efc9769a70a3d2167b00e5998fb4bcb8d5fe2547ed
 DIST open-isns-0.99.tar.gz 282831 BLAKE2B 7140daf08fda894bcbed3e25b122909ad0ed86b4f3db2e42a23b97480dea554194d2a33a3ebdf4e2017a57c2023dd8589f2e2fcfa60470cc3a6a3fbfb0d0ccbc SHA512 90a2297535c5e939f83c761173ce5f5f88e68adc31e41e833b23d07b6dc6959572ae7184db0084b861918199a877b251ebae4b4a7456fdd8c93400dc8457adc9
 EBUILD open-isns-0.100.ebuild 1216 BLAKE2B 84ab563aa4ad102480c2121d5d75137eb8dec956861aff8ebfa96f08317b349731984cf0c500a012dcf0200ab307863cf49fdd8583ab97a4969890732f45a0c4 SHA512 68ab4dd9f65241dbb65658b5ef1035ce4310d77028200c701d466900a0e11af8ca39b4e75da88c1cf11e19483fcbfd4b146bcca97a5b2d96ffc6d3a3543a8ed3
-EBUILD open-isns-0.98.ebuild 933 BLAKE2B afbb1d965a2eb63dc54ee059c9d3ebf952fccc181fb1d7fd347dafcaeed95758de94ede2b4703f48707cca85e418ec29401f8ccfe4e78d69b7e9476eec83aaed SHA512 11ee36e60e8679c572c99ec36422a55c214fcad6de02911fc525b4c4630005335c7cf14bf9798998beccbdc16e0e3fb8646c593a65546de7d4b5c2ba1d448ab1
+EBUILD open-isns-0.98.ebuild 929 BLAKE2B 962fd74c8666f42bb2d4879d17b212e18cd49c756ebeb68deb94cb7e9129d5973f2ead0a6b3ff21ee90578f05b7e5ef001c441e5f7bc6dba05cecd4acaac1b91 SHA512 ec3fc2fffc5f677787983e190e2a8f2b71632d48c0537ed2d84b0a4eed3af5a72bd989eaf04dd1b88cfa270fb6bb6cee64aa65127669a8a627bbbfa86d40fdae
 EBUILD open-isns-0.99.ebuild 1092 BLAKE2B 1e0ce4502ab428063bae59b56a2f6df6353fcbaf839e37c4fb5a6602be2e70c3f41bc8a8fbd98c680a84a70452fd46043b3f90a2e9e6d650fb8beff287ca6e70 SHA512 56a48b518e7d8316cc77c92cf8160fe792920a781f4e0f30f861e3803a0e228f913f579eaeb92d41df38d94af966687d72e12dc84fcec9892c227d64f236f914
 MISC metadata.xml 342 BLAKE2B 428bf589c8161595c69d65533c0df938c71d69fa6d56b1e4ac2a14bf528d5b93645fc667d3f8b698d4e28ca874c1ffbffb7d4daef712ffc79f5e10e542bf53e7 SHA512 a056b81c2e162e8b13a54f463476fea5f203b9929aeef07629b600d8f11eda26fe0402aec5e56a411e544b39d6c38a5766f773d4a699c72680f11f8dffc4bced
diff --git a/sys-block/open-isns/open-isns-0.98.ebuild b/sys-block/open-isns/open-isns-0.98.ebuild
index 98810887454e..d429794c4efd 100644
--- a/sys-block/open-isns/open-isns-0.98.ebuild
+++ b/sys-block/open-isns/open-isns-0.98.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/open-iscsi/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc ~x86"
 IUSE="debug libressl slp ssl static"
 
 DEPEND="
diff --git a/sys-block/rts5229/Manifest b/sys-block/rts5229/Manifest
index a27ee8d4fb7f..6186f5ff24a4 100644
--- a/sys-block/rts5229/Manifest
+++ b/sys-block/rts5229/Manifest
@@ -2,5 +2,5 @@ AUX rts5229-linux-3.10.patch 1261 BLAKE2B 3b6454e5de85a81f7b0697739cc1c881ef4095
 AUX rts5229-linux-3.8.patch 820 BLAKE2B 3893c1afeaa194941b4ed90157099c9be9e961f40963298aa6b147cf7fc7bc86d0db75e916a68e177e36b37b777761a7005773c6579fda546cc62a589ced2f90 SHA512 76152d71656f6312b0fbe17386c5cdc6973ee230b96b9b76e09de33d85114aa25017f461ab87f1e0b9cbd6fd3143ecd444ebbe153807fffab20fca0724f9d974
 AUX rts5229-vmalloc.patch 1043 BLAKE2B dcde2fedc2aa421582268488e59158267a73d7184c0608a71ff5403fcb4ae627315de2adb7dd816afa3607e8e3ad59b0a3e68217dc8541af928ae21ac5e6b547 SHA512 8784ece688f52fabe430e19c0b6fdde3eb81531e8b9af95fc2325a965cd36766a34a10bfcea61b8ea38169d143ee8a5185c4fc0814b2e8cac46b8f2b434b3879
 DIST rts5229-1.07.tar.bz2 67175 BLAKE2B 43b1488ca788889ebbdcdcc03b3653a4323ce4550507e45f69f03caab5b37b561a17159b39a57eec7347f11fe6fb4e032c4c43c7b882a1a7e9eada2339d71575 SHA512 8df0396d5a08a22507e3a0a56321de6b17d1ca90b5cbdaa9712f56f5f4db026d1b49b9dacf244407889d354cb8eeac4e771388a0fc6eb00295b81456459a4503
-EBUILD rts5229-1.07-r6.ebuild 1105 BLAKE2B 44fbd886c8101500b6816bbfd7832c90fb4a1f1cf0fd6db87da8e75479c858e50516ad3e8b61a98d5c7df4ccd46f2d8290ba39d661a2606a216b91ce0c248e07 SHA512 8aa28961429754784cafd705f831021c84f429325cdf85804cb6bd0d082537ae4ebedd3b5f67fc357a2bdfad52d11eeb910f6cb5ddc3fc95ac5e82bae16465d0
+EBUILD rts5229-1.07-r7.ebuild 1102 BLAKE2B 1b36ef30c6940e006ca25983d5472f3303415687de45fb2aa8ef6f71f9e88c3654d3ffc5063c662cb262e688dee16845964b8afd3da21bde89eaa610de9c193a SHA512 5c711cf6f3a1f9d74f33a69034340aa672869a7f78eb7c49725b9aec91d3ad542f5d49da659247dd973468f3195197be7637d849c26f48b2e35b60410e27ad0c
 MISC metadata.xml 259 BLAKE2B 6ac87e635cb16ac10f4d013e4c8e1201a72ca1ef5ebe19649efbfb46db3b94edf161403b728ce4df22dd6c27f604eed599bfdde388049d31e34c5f3dccadc94b SHA512 fb33755070098eaf5e742f4ef0c14c751f6733e4b4c8af7d01d63ec0256acdee8a64994512549eafa98d98e7a3066c6032ad20568b3b1bb296b7ba831d278402
diff --git a/sys-block/rts5229/rts5229-1.07-r6.ebuild b/sys-block/rts5229/rts5229-1.07-r7.ebuild
index 4dd4d7c41cb5..a8fbcc633137 100644
--- a/sys-block/rts5229/rts5229-1.07-r6.ebuild
+++ b/sys-block/rts5229/rts5229-1.07-r7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
diff --git a/sys-block/rts_pstor/Manifest b/sys-block/rts_pstor/Manifest
index 1d2eee95dc59..82f8c01a0c63 100644
--- a/sys-block/rts_pstor/Manifest
+++ b/sys-block/rts_pstor/Manifest
@@ -2,5 +2,5 @@ AUX fix-compile-kernel-5.0.0.patch 716 BLAKE2B ecb1bbdaf80d7e801f6e316308f559f29
 AUX rts_pstor-makefile-kernel-5.1.patch 204 BLAKE2B e5b84e6e1c08ecbb4ee88f51ab8d485b50604660bd09198a443f0e15e45e2f766a036fb7f81b3a5f8cf3e0c508070d216ac5532a646dff88ef1816a1b6b8be5b SHA512 440b431326f10f9becf7ef118e58e1b708fb109f6b58e5a06aad1581a33503e08078d186cd5298de09b27b62f885a140daa2245bf50e7b801fbb09a934fa27d8
 AUX rts_pstor-makefile.patch 319 BLAKE2B afb25a7184c13b90fd9babf975cfc7710d4e643aad97994ff5d2f4f9bf77fc9928a1a2391890723e10c51107ad0cf4a5919418a9cb0787885d57de5e9cb08b03 SHA512 ae6b3890edef023d9b965d765baf7aefa75b0b44d51296f4997b0bb20a41c6a0d6ee19381a3d9194c23198b59da2a4523a1547363e3c82ba27c3625009f8d8ca
 DIST rts_pstor-1.10_p20160103.tar.gz 108102 BLAKE2B 9cbca345211f7c99c6d9cf71b0ed207a4c911569eee6c63bfbe15c094be08f64c4550f04d9df688969f43564b2ff6a91d5cc72b8ab281cfdffb6884688b354de SHA512 d802a52b1e2da447a218472e77ca6ecc56e3b3767e3eb8daf634152675171c79c86e3b5ca9654b67cf32f63740c347bf7ecee5a1d20eb1c15a3a2ad3e9774311
-EBUILD rts_pstor-1.10_p20160103.ebuild 1655 BLAKE2B bf8cf45663b501a08f6a7ef6d7eb4035fb516f56ac53ca1c7b4b8b9002bcb516735f377a31e8766d08c976618ae688b201cf083b80c43b1854b74936ec239d0f SHA512 fd57a275c389f35a327ae3de379dc1d52bc65c148c88f9321226cff015321953a8e1dec53d09e7733d02a73537d8d45ea6d086fa15eb05f25714956564e32294
+EBUILD rts_pstor-1.10_p20160103-r1.ebuild 1655 BLAKE2B bf8cf45663b501a08f6a7ef6d7eb4035fb516f56ac53ca1c7b4b8b9002bcb516735f377a31e8766d08c976618ae688b201cf083b80c43b1854b74936ec239d0f SHA512 fd57a275c389f35a327ae3de379dc1d52bc65c148c88f9321226cff015321953a8e1dec53d09e7733d02a73537d8d45ea6d086fa15eb05f25714956564e32294
 MISC metadata.xml 338 BLAKE2B 518a4272f88da61f60f7ec2269dda5108abc8346f08e497d2bc8fd7d65700cb0e5e0bebbfb3503e44dc033452045c335c1d2c5e52dd8222d9467b578dfb79b09 SHA512 8de518f5f270304254bd185f4057700a117d05d151a981a887835c9f1af77fcaeb4c4cee3a9779e20ca28500779b16b3c09c4bdc619dc4d39e114d6b698e2ebe
diff --git a/sys-block/rts_pstor/rts_pstor-1.10_p20160103.ebuild b/sys-block/rts_pstor/rts_pstor-1.10_p20160103-r1.ebuild
index aebf0d373c10..aebf0d373c10 100644
--- a/sys-block/rts_pstor/rts_pstor-1.10_p20160103.ebuild
+++ b/sys-block/rts_pstor/rts_pstor-1.10_p20160103-r1.ebuild
diff --git a/sys-block/storcli/Manifest b/sys-block/storcli/Manifest
index 88cfb392a76a..d52acfa40956 100644
--- a/sys-block/storcli/Manifest
+++ b/sys-block/storcli/Manifest
@@ -10,6 +10,7 @@ DIST storcli-7.0709.zip 25844769 BLAKE2B f44791d0813f348068a89a14a0ea457667ab8e2
 DIST storcli-7.1017.zip 36266095 BLAKE2B e1bb4c6bbd19712530fc8d3d7917bf943221f121d0a7d5d3e44205f73bab408d7e4ff94d8cac479a1b834b82e8bdb6661805ca13f1695f8bad52d69d2c988fe9 SHA512 fb4b45fa577417627e67d20bbfa2e07512fe600ffeb9d21e11a80e25208f17b56fb25fa74a9777622c72012a605813b0206a990a6d4191f6b57371bd1d72fd6b
 DIST storcli-7.1211.zip 36988201 BLAKE2B 487dda0c78af60d96dc6eb8bc0c7074dd99719acc4faf10027430ea80a5d1cb76e6bdc9eaf0931967c5cdf10d80ee824f45118144bfc032a4ddce52d678df354 SHA512 f28ae41adf2286153ecd57f7d022940069356c9636e45aaae4ae45215487bbb8e3dea51fa4aa00b9e9340069036c1be21b186ce177e0fd0a6a0bb786cb58181f
 DIST storcli-7.1316.zip 37136466 BLAKE2B 7bca2e1b330f40e66945567ac8fad04d448993ff7ab4a4d846a0b6142fbe3988ab00775aa3897e3268e30b34cb7659e96f75d2383d3e85e4bec433edde5ba17e SHA512 049b34d44bb1140ad804f6bb6d8fb133ac9bbc4aface721051e713c7a1056acb0f894f4f4793ef9e02e48958a745d12bc5389e7e763716c780fb1c2c387e34d6
+DIST storcli-7.1410.zip 34424559 BLAKE2B cb0b613d0ccbf6ac36d1aace9174286ffe89d0602c7bca3b2712abcdba1b82cc2498de686e815e01fa125920c94d780e2f7fa4ab2ff570dc42818f4c4f491da4 SHA512 4887d434757f15e931c3c3c57b2316fc0cf0a5284c6009601b58c9585b73f9b9c9a0318dd3c4472cd3578aa5ec12b641a371db1d726a637741f6f0b34dd1f3e7
 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
@@ -19,5 +20,6 @@ EBUILD storcli-7.0606.ebuild 2486 BLAKE2B 0873b7c99026c2d3eee5c07bfa960c1b087ccb
 EBUILD storcli-7.0709-r1.ebuild 2345 BLAKE2B 3a03247560eceebed6c1413850607eb7c2b7f551668f2163745ba2c717450c72ccdaacea7bc328bf536a959b22b4e6478d718ba30b4b56ac6daaa34501fd0672 SHA512 e76b173a67d812f10dd21d5319ee1b9dfd20ba285005caeac9dac5b34a5f5306e0f64c5887dd7e852bdf838fd529c07bd2f3b5d593b8286502ae3bfe23596635
 EBUILD storcli-7.1017.ebuild 1806 BLAKE2B 31822ab31c50bbb0cf00bc126479888a1fd199a9304ab891f4c0dda0867c9f1e4aca7c62b484842e3bd84dee8ed57f7a1ef270b987fcc0156dc168d1ae033819 SHA512 abde801f76ff804ea33d14ab25b051743a9fe8d366b8663ad919e828fa4b10f6fd68c1b9e3b934b9c4447533657a689d5f324a09b9bae5424245fee5ec988b74
 EBUILD storcli-7.1211.ebuild 1822 BLAKE2B eeedf7c5527b0e14c6eb0ae2c619e9d1d941f42a18fafaa37d293a788a43c59f7967a67e2158498439a89ae7d6420ca8f673254d2e6f6a8efaa7811a32bb91b3 SHA512 f5b8660ae5f859ec7ae5e9ae3fb3b142e004be55c0c1a1c357ea70204f77b9cb0248c635305e5c49361a0de8b3f92fc44dab198c03483b107679ecf311abcccb
-EBUILD storcli-7.1316.ebuild 1824 BLAKE2B ef8f9ce33ab74f75daf9b914c650adbc26a6b2443da290c8a8665c0f97895e383d0a0edb88e455c5e053232d31dd1cadaee9af30794574c51e5dccf7f98eda95 SHA512 44dc99c79a34a473ad0131b4cff5b7514261668eb7717e64950d8b60a943621dd54b08659f7c8058cf9827e3dd991d64653e001d67b04ef85056b58e80ee5897
+EBUILD storcli-7.1316.ebuild 1822 BLAKE2B 3939bd238e40a3e41503efd7e5c8c87057b5b65511b985eff5530ffa661a445cb0818f870d5d64f18fd2b2f21dcf47365d225495146d4276b257f67a8cd05ac6 SHA512 b3661ca4af4e6308d1f87c0e8dff2b3b46b40df31f6fa7201fc80a3a4727fcdf39d7a7fb475674c41e3fd4d1a8ed5a2061a5328fe1ebd754141b7a079b6e7d10
+EBUILD storcli-7.1410.ebuild 1702 BLAKE2B 4d51a6d3db4a53bd6b7d896ba2976b13342289fa6c8c44e297e730672a845cef8fa998452fe81ef7c069b9e206b277ab184d5ca284af68fa608da07e5348d3e5 SHA512 f01cfdde3b43c42b5c90d9dd0feecfa48aa339e47c2186df23a30a9d674354d27cdc9372e0cc0b69f4df9de92a17b3994a35e84a5e26e3bb23626962fa6dd09c
 MISC metadata.xml 251 BLAKE2B fb85d245662fa1577cfe1d77526bd34fb2a674dd447192f2defe78b751423e3d14ae73efd3ac0e1e5e6fdb6259622a782e724ec77021faf526509f199dd20d61 SHA512 46942a98ef7e36470d1169a5bc8839d25603e33c143cd36327a8a85fc14cb6bfb32247eb7608d92cc58a06cc8eef5bd64d6ec2d21e69a88632e4b936598aa772
diff --git a/sys-block/storcli/storcli-7.1316.ebuild b/sys-block/storcli/storcli-7.1316.ebuild
index dc1d0ad80e74..913b118cc431 100644
--- a/sys-block/storcli/storcli-7.1316.ebuild
+++ b/sys-block/storcli/storcli-7.1316.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.13"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/sys-block/storcli/storcli-7.1410.ebuild b/sys-block/storcli/storcli-7.1410.ebuild
new file mode 100644
index 000000000000..cd0ac4c6ba7d
--- /dev/null
+++ b/sys-block/storcli/storcli-7.1410.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2020 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.1410.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.14"
+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/targetcli-fb/Manifest b/sys-block/targetcli-fb/Manifest
index 7d68ed81e57e..480da438a477 100644
--- a/sys-block/targetcli-fb/Manifest
+++ b/sys-block/targetcli-fb/Manifest
@@ -1,5 +1,7 @@
 DIST targetcli-fb-2.1.49.tar.gz 34147 BLAKE2B 49ed4a610282af30308373cdf806832a3441dcab9a52cddb3f59bacdecb79f7308f316cc65f526d6ea1f9bb875d05e049e6cd7d99eb243f25546395ba6aaa38c SHA512 05fb6f638f808bf09089bdd110592b3ed3be49fc70cc1a71680de7bff40dc88425e69e9a99fdfcab712646cf131f78071edae46f214fdfee4b7090f47933c93a
 DIST targetcli-fb-2.1.51.tar.gz 38577 BLAKE2B 0cc1cc920ec7bcefb987fac0397aa7c5a994cf47966971238a6c469e87b2dffc00dc09a55279b5ba0fda776a32a129ad3170b861e6309ea30f271ddc32f690f6 SHA512 a94f251889913888c430cfe2b2fa1b27e4cd01f05627f1c3f0d4c72145b23081be189b7ca5d381bffa0da74ba6a53146e7ca964ff864cb532f132e24bc205b9a
+DIST targetcli-fb-2.1.53.tar.gz 39586 BLAKE2B 35e5cea72580ba26b8397027e92446c129af5a94ab9458eed63ec731289065bcce759a77558a022c41b4ed73eefe865000e60b4e17816836f13056cb07071069 SHA512 acefa7f8df8ee901cae8f04cbeb264d6024100e2d8b8343024bc52842af88a23d1bf5dd880ff2c77046bd8da8493630b4e357103617c02d1a90947e42c3a7c92
 EBUILD targetcli-fb-2.1.49.ebuild 815 BLAKE2B d40abe7dabb6eef54e2bc65696e4656acd7277b9da245e52e9c318c92c2e61cab49a38ee5dc8721744a28c952a58df371efb0e23ee67c2c27d5e70e93021206f SHA512 521a6fa706fb91f7101afe8bc2ae4b183613eec635584a39aab2ec8296671c77bf8734d2bebbf8c8938d73a254cf7a4db38126aa3340e8a137ee2b4ef9d71d32
 EBUILD targetcli-fb-2.1.51.ebuild 712 BLAKE2B 43a884cbc45f427f3df861cbb9a2d784cf6eb04758d9df6b8373cce8777da27587233f55df438a702848e11c4c685df4e32683888da87679bdb33c14b7531b72 SHA512 981c5a93d85908b87a05d59330736ae758a13e40c9027f8538d75f449e65767796dedcfca97b0ce87b7b641b462f2b5de0f08656271e820fcf7b6711fafcac32
-MISC metadata.xml 712 BLAKE2B 7b038add297ff7f92e9c83df1d3bd493e169b9dbc42258c16b30884377f6538bb46151981779b2facbc3ced0a523c51cfbf9f3594a79152fc713b0c4d1816b57 SHA512 6c9af32d85c643e798be9215e7240cc2767abf09163a713d75ad29a0c5c30f6c7504ece5403c0acd1c131e97953d3c937d5488d0e70daf3717b9e275aeca844a
+EBUILD targetcli-fb-2.1.53.ebuild 724 BLAKE2B 8ba7e6aa0b3f8e8540b1645225402e3644f43ed1473d0073edc139130b3237409cc7830d923e987a34344846c18df744686440a05fbbe7175714520bf0b56ed1 SHA512 7536b77db6c0af875a8dad5679c0ba1aa3c31e8570ae0c96e69f18e9516e14792835db96e9ee319e3d659f95daa1d1d0c2bce89bd6e2ed059e392165f63be9bb
+MISC metadata.xml 735 BLAKE2B 6306128a74e5466aeb66571b1cfa2594415c8f824a9a0b45280693825cac5529e445b8dcf3f0a7983906bf9db33547438876cdc8a3e819d135ce8193d5f83070 SHA512 ccc02ad3448f3518ada4bd17c84a3bbe3b585fe5b54c83a2aa9d2ac98b3e5d6aaa32da81116ede44a53f6fee73fa8f1f7d0f0d37a2fd553d5cc87fdb18201307
diff --git a/sys-block/targetcli-fb/metadata.xml b/sys-block/targetcli-fb/metadata.xml
index abc38c494084..2bcdb6d3131e 100644
--- a/sys-block/targetcli-fb/metadata.xml
+++ b/sys-block/targetcli-fb/metadata.xml
@@ -9,6 +9,7 @@
 	<email>proxy-maint@gentoo.org</email>
 	<name>Proxy Maintainers</name>
 </maintainer>
+<stabilize-allarches/>
 <upstream>
 	<maintainer status="active">
 		<email>mlombard@redhat.com</email>
diff --git a/sys-block/targetcli-fb/targetcli-fb-2.1.53.ebuild b/sys-block/targetcli-fb/targetcli-fb-2.1.53.ebuild
new file mode 100644
index 000000000000..c0237e11495b
--- /dev/null
+++ b/sys-block/targetcli-fb/targetcli-fb-2.1.53.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit distutils-r1
+
+DESCRIPTION="Command shell for managing Linux LIO kernel target"
+HOMEPAGE="https://github.com/open-iscsi/targetcli-fb"
+SRC_URI="https://github.com/open-iscsi/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 x86"
+
+RDEPEND="dev-python/configshell-fb[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	>=dev-python/rtslib-fb-2.1.73[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	sys-apps/dbus"
+
+src_install() {
+	distutils-r1_src_install
+
+	keepdir /etc/target /etc/target/backup
+	doman targetcli.8
+}
diff --git a/sys-block/tgt/Manifest b/sys-block/tgt/Manifest
index d3129869a3f3..7dbb1c420d1c 100644
--- a/sys-block/tgt/Manifest
+++ b/sys-block/tgt/Manifest
@@ -3,5 +3,5 @@ AUX tgtd.initd 3435 BLAKE2B d2441a515c7a270472efd0c4ef5e928827bde54b248d09bb47f4
 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.78.ebuild 1511 BLAKE2B f8c27f0ea227cbbe2cfd26d8c38c5834a21114fba89bc0d2574629802cd93f9954022a6dbfbe3375538f5fb5f5c31612dfcf1ea2de2d1ff3b31b03c55bbbe026 SHA512 bd541ac602eee81239c350b7b34e812fac716175bb29bb5869727807dc2e3c81e9f353e7b24df7817a32fe7318ac25137ac42cc9b21a55e694d7976125815643
-EBUILD tgt-1.0.79.ebuild 1516 BLAKE2B 85fe2739328cbb7e4d0a6cbee37e00da4369920a761d743b6cbe7f4fc57b4b974fafa377ce110d83e6f06887a2c4f87c33cc024026d709f3c6ecb6e2b6b0221a SHA512 6f104551138a79bc4c71495ab7f5372d62b4b960a06c60b517732606d3345ba3f05eea285467420f42456f1702e862a836f6f6d1498b13f23bbf8fb4981035dc
+EBUILD tgt-1.0.79.ebuild 1515 BLAKE2B 2e355b6de4af36ad27d9b433c428a1f5fb56305a0d3805212af7a9b34c188f0d666a6e0b8b6d76bb1d526b55ee70cda8a6ba18f25ac8ff0592bfbb67be5eacac SHA512 0137b26fae4524999ed5c08c026d3ce9fe00c2378eb6564c8bc6872f3dd2b0bb66a28c0d5b70294f3f6dbc2263cf264936ca715688b860ec2006461ef914daa4
 MISC metadata.xml 825 BLAKE2B 89a6844eade4098443db47dcd5b3350c1bd6f4c0ffbdb6277df5714fdfd248d056f770f05e1392d64b573a28ca9db140dc7130e0109075c7fd398677ca251af9 SHA512 0c75be2e830ff683c8cae93175504a1e6508131d704c48d31b9fe98baa6b3a1e491661fda6180c0c1e35ef7e9bd57309d05e07b41160a7cc090934913e186f9f
diff --git a/sys-block/tgt/tgt-1.0.79.ebuild b/sys-block/tgt/tgt-1.0.79.ebuild
index 0e5097a2420e..d6261e6104c8 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 ~ppc x86"
+KEYWORDS="amd64 arm64 ~ppc x86"
 IUSE="fcoe fcp ibmvio infiniband rbd"
 
 CDEPEND="dev-perl/Config-General
diff --git a/sys-block/thin-provisioning-tools/Manifest b/sys-block/thin-provisioning-tools/Manifest
index ac9c2b0aed2b..c92a60c3a354 100644
--- a/sys-block/thin-provisioning-tools/Manifest
+++ b/sys-block/thin-provisioning-tools/Manifest
@@ -2,11 +2,11 @@ AUX thin-provisioning-tools-0.7.0-build-fixes.patch 1077 BLAKE2B 540efcaff8a0f82
 AUX thin-provisioning-tools-0.8.5-libaio-0.3.112.patch 2516 BLAKE2B 22c2293a00838a1207a0892e93985c8350b5d8f75d1e1eecab4d74346780be57d82f40a44f3cee49e14fbc7bb5d50f62b110c7a34295a0fa76f98374003e3feb SHA512 a53dab2e755221daf3c38602a537f32fc60128cffef60ad309711c8c4e528c5ea888f8904c5f34597f1df023b4ad0b82b609c944095f8e628d66519178a1ab52
 DIST thin-provisioning-tools-0.7.0.tar.gz 230595 BLAKE2B 00238a682f80600e3a5bb6d0d2a9662bd0fd3ae5404d5895427f169640b469780f554c22c6a93187058e6399c76ba14a6fa8d73f2bb09aa79927dd458b58ffa9 SHA512 cb6c44c7215aadd72292d73e2374d8c0c28566adcb10c7a3de83576dbd28649ebba6e2cc59945a28921e423540969cb21f648c37e375d68f48e56a8be4a4c7b8
 DIST thin-provisioning-tools-0.7.6.tar.gz 285428 BLAKE2B af74eff6d435f00e347872786fee8627f02844af122a9f1bf9ffd00234ce5275d3a61d9b4204313a19813cadbc0197bbeb9a1bd92d55992c6d9a03a299579e29 SHA512 395035b6f59fafb1c0f3e68750611e04f10223bc8d57b257e25c28c928647d1d2c6e94014b64ed90eeae1151fc7e5d23cf1aa428716e343338cb3c8fe55ed704
-DIST thin-provisioning-tools-0.8.3.tar.gz 305338 BLAKE2B 619f73ef7bd802eb72649d0bdaa8ce1d6afb4d7ae442ac7d2d709764aaa5058bf77b12710a332cf5f8215cfb94e1d63c189951058e2373467ca88c847e32cd8d SHA512 a69645d45fd62a487903a07f922fd622b5fb9c7858e656b9468903005ab7daa3098aa89ae356f2458fcf95e3c0672bf486b424553d82ffae54b83c0b71599541
 DIST thin-provisioning-tools-0.8.5.tar.gz 305585 BLAKE2B 7e4bde537535db79e97ddab3cba775c89854362dac7da491c040badf5e3546d2e6ac4b8da8462edb59f50a2ecd95fe9c5e3349fca5e9acd588efaaf990617ca4 SHA512 1f9a1b6b9059f0b23ec3a00ddef223599292d447894316525f13b9c1e4f29d0371cb901d199cb503be4342555e016e5e6eb2d6e0e10c44b08e6c9478c573e1d4
-EBUILD thin-provisioning-tools-0.7.0.ebuild 1312 BLAKE2B 292ce2bc255d3732860a750fe1a65bbcfcc25ef3ba5e2de5ed6177de24131b70fd08f090f38c512e9432a8634ef3299065e0abaa24bf7707ff0e4f7203280c80 SHA512 810cd253e3f79af5cf93847bef141d11c4644312e762584e3c92617eaeb7b002823d2197adb8d488da2d6369e0ebf68070bda0c68984a41ceb3dab2a7c0848f5
-EBUILD thin-provisioning-tools-0.7.6.ebuild 1322 BLAKE2B b4440bdb7b5f537f269fdbf3b7ec3eb574cf9cc690ce17f18a9b92916905edea220a9e71563a462f27a3d6c105436ef13e7a556ecb83005cc7decfeacb69cf49 SHA512 0bded1b7ff72bae1a2a955ae5338fbb02808b53dd39994e80325a2712f98178bebf3d9cb6e9c103d7006674c23d952ede856fd553bc3df0b95481cc39d1d0cb0
-EBUILD thin-provisioning-tools-0.8.3.ebuild 1515 BLAKE2B a2208426c2e153f1b5219bc233b7918749ff0efdbbf34727be0c40a052a5649b80c95ad97721c4e66a3377046f595ae71e17b7f2567e6dd3fe0ddf7c6b6fa09a SHA512 43aadd01bfca33e250f3517cc378095713a1fc6e07c52884c98188542c8d6f23459cc393743b15b52ecb8ee308250d53fe3d4120b8725c8a23d43d8e00918f59
-EBUILD thin-provisioning-tools-0.8.5.ebuild 1570 BLAKE2B 16254a2696eccc0799a49c5ffa156b61e14f1d0a7b356aed7d81b446650e2784f778cfbf9081aa90fbfb39e49f6df033fc4f466c3afaca2f898fc57e0245de4a SHA512 b6ae40beda0cd7d70236f7d98d5a9bd10112edc9ab403d1eb0e4fb480a89b2fd035bfa27b35fab5da7013c10163e1318c5a1f645229090e5b14eb9f002ff8180
-EBUILD thin-provisioning-tools-9999.ebuild 1515 BLAKE2B a2208426c2e153f1b5219bc233b7918749ff0efdbbf34727be0c40a052a5649b80c95ad97721c4e66a3377046f595ae71e17b7f2567e6dd3fe0ddf7c6b6fa09a SHA512 43aadd01bfca33e250f3517cc378095713a1fc6e07c52884c98188542c8d6f23459cc393743b15b52ecb8ee308250d53fe3d4120b8725c8a23d43d8e00918f59
+DIST thin-provisioning-tools-0.9.0.tar.gz 500998 BLAKE2B ac269fb6dfd1baf1572da27582ac2cd763b07aaac130a9467d05581e7a0ba1309d7dbf4c6095407111667e57af2e8183318d558ed23853f9c84b9c151c0878d9 SHA512 e1796fb3948847d72ca8247cae58017507c0a847a00201b93668eeb8fbfea4107c4c2affa5c211c149798a89b10474e83d2bd61a5545a668299be97aed591e0f
+EBUILD thin-provisioning-tools-0.7.0.ebuild 1287 BLAKE2B 0b565635eeda6a26bad5fbd6ffffe26f82cfab495d483ed41e6e7e17b6048c4fe98d07e41b5b69cb3482c5a2916f452d32edccb887a7b2bf0758f6b92829f391 SHA512 01323a16fa2e3283fdc7ea7df90e10f9f9320acdcee136d8bb754a2b4c0ea4084980417a78a389dbc1d389a7aeeeebfac482d88c4f1bae1e6ef9d0ae512504d1
+EBUILD thin-provisioning-tools-0.7.6.ebuild 1297 BLAKE2B ec8c85608bca92e5eed6d3da57c6724c83104376aaddae5ab91f3548850eb7d32db91f234ab2bfdadfac609d068e34ae8942e405d923bad5d92204d64775c79a SHA512 b0dab6fe64614b808a020e18183b3c92e7603e20529880ba3cc3e26d156b62b05e7f50421d8ef97de1f7130f625dcc25c603f655d87201f84b45c0e0e176561c
+EBUILD thin-provisioning-tools-0.8.5.ebuild 1549 BLAKE2B 06bbfbb1dec6a16af86ce1e183d86f6564237f227cf1a270aab3fd2750f3906f060e60afc34fcd650f8f4e1d474854ac5f6f449c646f4f02163d2dabcbda1366 SHA512 a01f7de103b44acf7388da317b8f00930cece3b2743ca4619fb134b69868ac077fc3a01a70d1530c8e83b1c5b9ae7710e734548e1df8b9d7e73d375e0b3b0ed5
+EBUILD thin-provisioning-tools-0.9.0.ebuild 1522 BLAKE2B af8b1fde9fa01980f243b42210e20937cf083bb7c905ad7f599f3abe2bd1f0dedc75b3a45b0ca6c004f21e14eba1fdfd53587cb2179e90cf1906b663d0f01658 SHA512 c6245f1188e10ac1eada861bd0e8e157f893ea895172543cc4a43b388ed86acb3b793f37f9a713824def9a18338a527827c74b1317a02725bc842088e295f9d9
+EBUILD thin-provisioning-tools-9999.ebuild 1522 BLAKE2B af8b1fde9fa01980f243b42210e20937cf083bb7c905ad7f599f3abe2bd1f0dedc75b3a45b0ca6c004f21e14eba1fdfd53587cb2179e90cf1906b663d0f01658 SHA512 c6245f1188e10ac1eada861bd0e8e157f893ea895172543cc4a43b388ed86acb3b793f37f9a713824def9a18338a527827c74b1317a02725bc842088e295f9d9
 MISC metadata.xml 531 BLAKE2B 37dbd49f21f2816fec9f5b620dae0e5d95f4233bedfcdcdd54d573899fc3aaf48ff6c82b62ceeb36f400924889ca52f3f826ed62c8333bc2723c40e1fe697117 SHA512 80fde34da9de5b2436c096bc9051ccb55124c330dc82ac538f66a100225623aa7cb0869041179999608cc52613e40ba464b46630cff52423c13d1a374eb98ed0
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 66c1699c8261..1e994549f378 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.4 )
+		dev-lang/ruby:2.5
 		>=dev-cpp/gtest-1.8.0
 		dev-util/cucumber
 		dev-util/aruba
diff --git a/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.7.6.ebuild b/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.7.6.ebuild
index faad3397c9c4..9488fd97cf6b 100644
--- a/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.7.6.ebuild
+++ b/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.7.6.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.4 )
+		dev-lang/ruby:2.5
 		>=dev-cpp/gtest-1.8.0
 		dev-util/cucumber
 		dev-util/aruba
diff --git a/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.8.5.ebuild b/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.8.5.ebuild
index 7ef022f2d096..67967d50aa6a 100644
--- a/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.8.5.ebuild
+++ b/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.8.5.ebuild
@@ -30,7 +30,6 @@ DEPEND="${RDEPEND}
 		|| (
 			dev-lang/ruby:2.6
 			dev-lang/ruby:2.5
-			dev-lang/ruby:2.4
 		)
 		>=dev-cpp/gtest-1.8.0
 		dev-util/cucumber
diff --git a/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.8.3.ebuild b/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.9.0.ebuild
index 172223fe821b..65d83fdf939e 100644
--- a/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.8.3.ebuild
+++ b/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.9.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/jthornber/thin-provisioning-tools"
 
 if [[ ${PV} != *9999 ]]; then
 	SRC_URI="https://github.com/jthornber/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 else
 	inherit git-r3
 	EGIT_REPO_URI='https://github.com/jthornber/thin-provisioning-tools.git'
@@ -28,9 +28,9 @@ DEPEND="${RDEPEND}
 	static? ( ${LIB_DEPEND} )
 	test? (
 		|| (
+			dev-lang/ruby:2.7
 			dev-lang/ruby:2.6
 			dev-lang/ruby:2.5
-			dev-lang/ruby:2.4
 		)
 		>=dev-cpp/gtest-1.8.0
 		dev-util/cucumber
diff --git a/sys-block/thin-provisioning-tools/thin-provisioning-tools-9999.ebuild b/sys-block/thin-provisioning-tools/thin-provisioning-tools-9999.ebuild
index 172223fe821b..65d83fdf939e 100644
--- a/sys-block/thin-provisioning-tools/thin-provisioning-tools-9999.ebuild
+++ b/sys-block/thin-provisioning-tools/thin-provisioning-tools-9999.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/jthornber/thin-provisioning-tools"
 
 if [[ ${PV} != *9999 ]]; then
 	SRC_URI="https://github.com/jthornber/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 else
 	inherit git-r3
 	EGIT_REPO_URI='https://github.com/jthornber/thin-provisioning-tools.git'
@@ -28,9 +28,9 @@ DEPEND="${RDEPEND}
 	static? ( ${LIB_DEPEND} )
 	test? (
 		|| (
+			dev-lang/ruby:2.7
 			dev-lang/ruby:2.6
 			dev-lang/ruby:2.5
-			dev-lang/ruby:2.4
 		)
 		>=dev-cpp/gtest-1.8.0
 		dev-util/cucumber
diff --git a/sys-block/vblade/Manifest b/sys-block/vblade/Manifest
index 0505f58ed6eb..3b0721611680 100644
--- a/sys-block/vblade/Manifest
+++ b/sys-block/vblade/Manifest
@@ -1,12 +1,6 @@
 AUX conf.d-vblade 817 BLAKE2B befac1b206fa3442c5e820baff8efdf4cff443b449ae23679d6bf5f491e530573acb59a1dba4d299d3f0020cdbf1b57a18bf756a38cd847ee5842549a683ce55 SHA512 b65275d01a367888d16a3d51b189f01ceb7634d7b5a1dc02860ecae9a5030d18e99fd47a842748b5ccf48204242fb6d7613698fc3e21f6a1790d91a7600c172f
-AUX init.d-vblade.vblade0 2785 BLAKE2B eb2055b8969494e7383291f69689fd8ab44838a0f6371666271594b98f7ead698d94ee44b6e0fd4ba931f5821c8d37d330e9403c8a235b1f954ea03e18dd4463 SHA512 d2665414e5e3fb209e90a7a7bd63edf5dce61735a4bdd1bf347d8b55b9ad57e88eaa2c9c995294ffffa89da7727f5facdfe9468ed212ed6d0497304b54bf92df
-AUX init.d-vblade.vblade0-r1 2927 BLAKE2B e1846a4c2f1ad8c49734512ead6386d39005c23ffdf51ba9212df4cc87665b49115746fe77e1874bd89fcc04a9baa3bac5aea14d62485bc51545aa4a44627065 SHA512 97a72cbf49e363ab1bc62b43c84c04ece79e777c3c427ce59850f257203124bfb662e6e7959e3d77d06bc9e85de3fb030e42d325e1ba258dbd184ac6ab46e438
 AUX init.d-vblade.vblade0-r2 2909 BLAKE2B cf70ce62776c6e79c75110d4622c2913090221d336cea7674a9ba87bd4fb3ea3d7bf5e374d1b9b00693bf864573fef04de11a1b13acc8eb2087811d7fafe9a39 SHA512 1250bdefad4a6abe107d9ceb296b26204c0c9731a963a5a595e799cf2ac3eb10a2d2f48335baf55fa54d220da476e0013b4cd641d35686250794b48e81912403
 AUX vbladed 544 BLAKE2B 88badea5aad70934eb16731ea2ce93762d282193b43efd25f71b3fc2a69eb3825bcf3db9cc243fb58f38874d2c6c13ab8368817c489bd27581101ad6c1a7c908 SHA512 447dbec563f41848727fe72ff391c07136509acbb707cf427485ef9ad190ec4247d809a2d71136e8f5456cf4f1798b89c9ca4ddcc4407f71d63ad220dab37c30
-DIST vblade-20.tgz 26689 BLAKE2B 854b42535c884b670ae94ff3b27272664f6470dd1cb1993665fd64604a556700b05785de6bf5d2dd3c79f6bbf867248c77e4aa6218240e0a3c43535fdc556568 SHA512 b6c10ff9d75a2fc99c93af6b6de8f23c8b17ab70e2d5ed7049389ee8752ad001b3940764af16ff06f7f38c7bc528065edb0f285663af6fdd00fe58f022c26f02
-DIST vblade-23.tar.gz 27432 BLAKE2B 2151656f593771e44fe17a60216dceb4286a3a8d20cb88112c745213fb9c480542330dc67b0936e02cafd8c8de2f43e5ce942575f8508ba80ffde9676c75d264 SHA512 a27379933b5c0fc84966f47e0ee0089fe978fe77ea38d91c21fb6bb6bc4fa7f393b8b4c57f84c6840b549908eb8666847f121b836e3a076895e038e8096c0cfa
 DIST vblade-24.tar.gz 27638 BLAKE2B 8a99d571b3b97d47ce9c81ef8141e0d6477181e88aa56e3ea7d03c689c747a60922c21969ea009cf978a3cb15bcb969b12df50f2bd8e6bb498a8bc6d483be1d3 SHA512 d5db85581db119b83a129fc00635d37b6d8fccfaf685dc58c68773c7299f7fe4e01735ec7fea6a0494a0cf2bc1400d643a720b55e4d6de37a0b8ec15d00d1f2a
-EBUILD vblade-20.ebuild 757 BLAKE2B 6e3311210e11eafc4c00f1a8fda523972989ae43c90294ef50534e1dd92c9d390a9c422939ea05bf0b98fd24c8b47f8d96fb1365b8488ab909d1c87ab335559a SHA512 9c884688885859be759c23f1dd1418b28915ed2c059a2aa060af9a82b57919197366b1c1b89025074c0c309ff57e9142f001c2cf8f80aacac7f1492452bea07c
-EBUILD vblade-23.ebuild 808 BLAKE2B c48d1bd1e52382f15e3141b869ec4efc50196746dabf749c7d5fe46997604dfe44a5adfc35b1a9b6aa3192603cb56e422b2f8ae9bd6a390e3830c21102d82721 SHA512 1d6cfabebd2ba3fc13128db1a438967418fdd16c3136b6019b9094c152a85d37d3ffda0cea6abf557937c603400338d5cabac6693594c791c477f8ac8ee8b30f
-EBUILD vblade-24.ebuild 810 BLAKE2B 223974bc414c0e8f3a13c0f9f8f73393b63264a82032fa62abf054165d480361304200977770b90fd2e60fb8ab03b222eacdada0d1a6a10d19597ced16261ff8 SHA512 8817725f1e5515921cd58b23281289b3cf8323e1c5d69a393c91b543bbe5c29ee6b8291f9aab4db05a17deedaf89ca72215527778bec7962def8e807b972625c
+EBUILD vblade-24.ebuild 803 BLAKE2B 155f55c789f5df59ad6fe7a1edb4228ce12716f1c01ea8e76e4dc7bd5a235f80fd066c29e374b350240001a7c0cab2fbc0a49e2f4fe986dad3c6e206d0751799 SHA512 8071f8d23354e06ab5ad771d350f05c77f25f55d123efd9c9bae5b49ee091157ba0a27aa8b064ce1557062ce96336a9c87bc8fab3dfbc1987c4da306e56f321c
 MISC metadata.xml 328 BLAKE2B b04b8d9c3016fc84883de505bb4b5fa0dd0f97d8a07c1e84995b7b2931f6b356cfb0f59b7665f7a9c63955a3ee7bae5d37379a326eafe20d58840bd236562718 SHA512 5f04425d524c4535b0b3b42a2c310afa42f09649929f08e12bb491ae808f2fb8dbd08e3c153426bdcef328291b9b19feea2c557ef0a2c6e3a98fc69824c11ca5
diff --git a/sys-block/vblade/files/init.d-vblade.vblade0 b/sys-block/vblade/files/init.d-vblade.vblade0
deleted file mode 100644
index 253304dc187a..000000000000
--- a/sys-block/vblade/files/init.d-vblade.vblade0
+++ /dev/null
@@ -1,120 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-
-extra_commands="checkconfig"
-
-depend() {
-	need net
-}
-
-# bug #218043
-if [ ! -f /etc/init.d/sysfs ]; then
-	conf="$(add_suffix /etc/conf.d/vblade)"
-	[[ -e "${conf}" ]] && source "${conf}"
-	vblade_name="${myservice#*.}"
-else
-	conf="/etc/conf.d/vblade"
-	[[ -e "${conf}" ]] && source "${conf}"
-	vblade_name="${RC_SVCNAME#*.}"
-fi
-
-vblade_conf_variable="config_${vblade_name}"
-vblade_conf="${!vblade_conf_variable}"
-pidfile="/var/run/vblade-${vblade_name}.pid"
-srvname="vblade.${vblade_name}"
-
-getconfig() {
-	tmp="${vblade_conf}"
-	shelf="${tmp/ *}"
-	tmp="${tmp#* }"
-	slot="${tmp/ *}"
-	tmp="${tmp#* }"
-	netif="${tmp/ *}"
-	tmp="${tmp#* }"
-	src="${tmp}"
-	export shelf slot netif src
-}
-
-checkconfig() {
-	if [ -z "${vblade_conf}" ]; then
-		eerror "vblade configuration not specified for ${vblade_name}"
-		return 1
-	fi
-	getconfig
-	
-	is_valid_numeric "${shelf}" 0
-	if [[ $? -ne 0 ]]; then
-		eerror "Shelf '${shelf}' is non-numeric or less than zero."
-		return 1
-	fi
-	is_valid_numeric "${slot}" 0 15
-	if [[ $? -ne 0 ]]; then
-		eerror "Slot '${slot}' is outside the valid range [0..15]."
-		return 1
-	fi
-
-	sysfs_base="/sys/class/net/"
-	procfs_base="/proc/sys/net/ipv4/conf/"
-	if test ! \( -e "${sysfs_base}${netif}" -o -e "${procfs_base}${netif}" \); then
-		eerror "Network interface '${netif}' does not exist"
-		return 1
-	fi
-	
-	if test ! \( -f "${src}" -o -b "${src}" \) ; then
-		eerror "Source '${src}' must be a file or block device"
-		return 1
-	fi
-	
-	if test ! \( -e "${src}" -a -r "${src}" \) ; then
-		eerror "Source '${src}' is not readable."
-		return 1
-	fi
-
-	return 0
-}
-
-is_valid_numeric() {
-	num="${1}"
-	min="${2}"
-	max="${3}"
-	# non-numeric
-	test "$num" -ge "0" 2>/dev/null
-	rc=$?
-	test "$rc" -eq 2 && return 2
-	# check for min
-	test -z "$min" && return 0
-	test "$num" -lt "$min" && return 1
-	# check for max
-	test -z "$max" && return 0
-	test "$num" -gt "$max" && return 1
-	# done
-	return 0
-}
-
-start() {
-	checkconfig || return 1
-	getconfig
-	ebegin "Starting ${srvname}: e${shelf}.${slot} on ${netif} using '${src}'"
-	export LOGTAG="${srvname}"
-	start-stop-daemon --start --quiet \
-	--pidfile ${pidfile} --background \
-	--make-pidfile --exec /usr/sbin/vbladed -- \
-	${shelf} ${slot} ${netif} "${src}" 
-	eend $?
-	
-	#${shelf} ${slot} ${netif} "${src}" 2>&1 | logger -t ${srvname} &
-}
-
-stop() {
-	ebegin "Stopping ${srvname}"
-	#start-stop-daemon --stop --quiet --pidfile ${pidfile}
-	getconfig
-	ps -Ao pid,args | egrep "^[[:space:]]*[[:digit:]]+ /usr/sbin/vbladed? ${shelf} ${slot}" | awk '{print $1}' | xargs kill
-	eend $?
-	
-	#start-stop-daemon --stop --quiet --exec /usr/sbin/vblade
-}
-
-# vim: ft=gentoo-init-d syntax=gentoo-init-d :
-# vim: ai sw=4 sts=4 ts=4 :
diff --git a/sys-block/vblade/files/init.d-vblade.vblade0-r1 b/sys-block/vblade/files/init.d-vblade.vblade0-r1
deleted file mode 100644
index 174e473ffc17..000000000000
--- a/sys-block/vblade/files/init.d-vblade.vblade0-r1
+++ /dev/null
@@ -1,125 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-
-extra_commands="checkconfig"
-
-depend() {
-	need net
-}
-
-# bug #218043
-if [ ! -f /etc/init.d/sysfs ]; then
-	conf="$(add_suffix /etc/conf.d/vblade)"
-	[[ -e "${conf}" ]] && source "${conf}"
-	vblade_name="${myservice#*.}"
-else
-	conf="/etc/conf.d/vblade"
-	[[ -e "${conf}" ]] && source "${conf}"
-	vblade_name="${RC_SVCNAME#*.}"
-fi
-
-vblade_conf_variable="config_${vblade_name}"
-vblade_conf="${!vblade_conf_variable}"
-pidfile="/var/run/vblade-${vblade_name}.pid"
-srvname="vblade.${vblade_name}"
-
-getconfig() {
-	args=""
-	while getopts b:dsrm: FLAG; do
-		case "${FLAG}" in 
-		b)	is_valid_numeric "${OPTARG}" && args="${args} -b ${OPTARG}" || ewarn "vblade block size argument is non-numeric IGNORING";;
-
-		d|s|r)	args="${args} -${FLAG}";;
-
-		# FIXME: there is no sanity checking on the MAC address...we'll leave that up to vblade
-		m)	args="${args} -m ${OPTARG}";;
-		esac
-	done
-
-	shift $(( OPTIND - 1 ))
-
-	shelf=${1}
-	slot=${2}
-	netif=${3}
-	src=${4}
-
-	export args shelf slot netif src
-}
-
-checkconfig() {
-	if [ -z "${vblade_conf}" ]; then
-		eerror "vblade configuration not specified for ${vblade_name}"
-		return 1
-	fi
-	getconfig ${vblade_conf}
-	
-	is_valid_numeric "${shelf}" 0
-	if [[ $? -ne 0 ]]; then
-		eerror "Shelf '${shelf}' is non-numeric or less than zero."
-		return 1
-	fi
-	is_valid_numeric "${slot}" 0 15
-	if [[ $? -ne 0 ]]; then
-		eerror "Slot '${slot}' is outside the valid range [0..15]."
-		return 1
-	fi
-
-	sysfs_base="/sys/class/net/"
-	procfs_base="/proc/sys/net/ipv4/conf/"
-	if test ! \( -e "${sysfs_base}${netif}" -o -e "${procfs_base}${netif}" \); then
-		eerror "Network interface '${netif}' does not exist"
-		return 1
-	fi
-	
-	if test ! \( -f "${src}" -o -b "${src}" \) ; then
-		eerror "Source '${src}' must be a file or block device"
-		return 1
-	fi
-	
-	if test ! \( -e "${src}" -a -r "${src}" \) ; then
-		eerror "Source '${src}' is not readable."
-		return 1
-	fi
-
-	return 0
-}
-
-is_valid_numeric() {
-	num="${1}"
-	min="${2}"
-	max="${3}"
-	# non-numeric
-	test "$num" -ge "0" 2>/dev/null
-	rc=$?
-	test "$rc" -eq 2 && return 2
-	# check for min
-	test -z "$min" && return 0
-	test "$num" -lt "$min" && return 1
-	# check for max
-	test -z "$max" && return 0
-	test "$num" -gt "$max" && return 1
-	# done
-	return 0
-}
-
-start() {
-	checkconfig || return 1
-	ebegin "Starting ${srvname}: e${shelf}.${slot} on ${netif} using '${src}'"
-	export LOGTAG="${srvname}"
-	start-stop-daemon --start --quiet \
-	--pidfile ${pidfile} --background \
-	--make-pidfile --exec /usr/sbin/vbladed -- \
-	${args} ${shelf} ${slot} ${netif} "${src}"
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping ${srvname}"
-	getconfig ${vblade_conf}
-	ps -Ao pid,args | egrep "^[[:space:]]*[[:digit:]]+ /usr/sbin/vblade.* ${shelf} ${slot} " | awk '{print $1}' | xargs kill
-	eend $?
-}
-
-# vim: ft=gentoo-init-d syntax=gentoo-init-d :
-# vim: ai sw=4 sts=4 ts=4 :
diff --git a/sys-block/vblade/vblade-20.ebuild b/sys-block/vblade/vblade-20.ebuild
deleted file mode 100644
index 7d5ed1198e8e..000000000000
--- a/sys-block/vblade/vblade-20.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit toolchain-funcs
-
-DESCRIPTION="vblade exports a block device using AoE"
-HOMEPAGE="http://sf.net/projects/aoetools/"
-SRC_URI="mirror://sourceforge/aoetools/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE=""
-
-RDEPEND="sys-apps/util-linux"
-
-src_prepare() {
-	sed -i -e 's,^CFLAGS.*,CFLAGS += -Wall,' \
-		-e 's:-o vblade:${LDFLAGS} \0:' \
-		makefile || die
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-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 vblade.vblade0
-}
diff --git a/sys-block/vblade/vblade-23.ebuild b/sys-block/vblade/vblade-23.ebuild
deleted file mode 100644
index bf2ac0290947..000000000000
--- a/sys-block/vblade/vblade-23.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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}"
-
-src_prepare() {
-	default
-
-	sed -i -e 's,^CFLAGS.*,CFLAGS += -Wall,' \
-		-e 's:-o vblade:${LDFLAGS} \0:' \
-		makefile || die
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-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-r1 vblade.vblade0
-}
diff --git a/sys-block/vblade/vblade-24.ebuild b/sys-block/vblade/vblade-24.ebuild
index b14ea838c8c9..418e75559d0c 100644
--- a/sys-block/vblade/vblade-24.ebuild
+++ b/sys-block/vblade/vblade-24.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/OpenAoE/${PN}/archive/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 
 RDEPEND="sys-apps/util-linux"