Merge branch 'edge' into next

26 files changed, 175 insertions, 222 deletions

diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz
index a121df765ed9..a43ba6e21aa2 100644
--- a/sys-block/Manifest.gz
+++ b/sys-block/Manifest.gz
diff --git a/sys-block/fio/Manifest b/sys-block/fio/Manifest
index edf9688957b5..048d81f044e7 100644
--- a/sys-block/fio/Manifest
+++ b/sys-block/fio/Manifest
@@ -11,11 +11,11 @@ DIST fio-3.2.tar.bz2 613565 BLAKE2B e721d698338dd8d2c6215780a2d9a10c643a5912d3c2
 DIST fio-3.7.tar.bz2 629354 BLAKE2B 99a1c88481c7a693e31b1a0bc23bc80e85df92385f9d5a7de8d6479be8bc425326a20d794eb4809f822adfcd06e07c66ebed321faa9dbae7a2c1d3c766a6467d SHA512 b1f5cb35fe1c06e030c570959ab9a96d936f9eaa2f7f30d5a34f34fd93fae057da07c4084a06143cd5188ad6b2cc06b564484f8867e050cfeddc0ee3fb0fe266
 EBUILD fio-2.15.ebuild 2694 BLAKE2B 25fb3d52cd2112eb109b84b4d0e708247febecde2bf2895753099ee98867e3f88b3eb979744a75cf813f5b9849973c21f62763483b2bc98ac616e8e44fc10022 SHA512 5c900408b89d6526adddaa2ef51e87da1c9a934ac1dff463cdae33b274259611b01c45bbed5901f88482789390bd0397099cbfba78d3dc753796d73881eea9bd
 EBUILD fio-2.16.ebuild 2907 BLAKE2B b524791f0ecea03ae3a17994295224963fb9eb10b2b339f4dbdcbb546fbafd24cf905777817878cecd22df2158f84ed1ddfc6d311909ca569bd5ef91da0f1218 SHA512 ae8bd404cddedd37a41729e1ec570df997dd9b4484daa9e77a75c4887ee0bb26d5cffbb015fd1e154103d276f2db11486bb49d09b8dbc897f3d5ba5865fb1559
-EBUILD fio-3.16-r1.ebuild 3597 BLAKE2B bf428d5695302fc3014dc0708b17c1457ec5f2bc54785f66acd54c7737ce9678fc98d96fb18784a4c8934b7a5964342493e24c98f2df116412e4acefe0658180 SHA512 b1ce7d1e31dcd2f1f2368d76459870ff1b157c3e311adfab62553105209cbea16a898b4e5ba53216eb97dedfa7b72409e072252d1931c702cc5d9ad255745aec
-EBUILD fio-3.16.ebuild 3546 BLAKE2B 95eb92a3c0e390bd9a1b4c7e02a0025031d1d3f203df1a03813e40db7f4a9550847ca36bd6b11c9aaa82b9e29afd3368ec039d1d96f1017611f965abb3462d3a SHA512 090fa98cad51a50de4120a9c61bba262fe26564dae5075d010b18d1a72f722db0a3c7630c212a2c54f5d07c8d2bb21d380268796b98e1054ca1721c2c7a5b9a7
-EBUILD fio-3.17-r1.ebuild 3954 BLAKE2B 07679b26b26d69613f78e30f26675cbfc55a96afb4091df1805828d3622cc5635332d7eb47c71ee0d8aa2d43197f333c0bb4d58a85eaf55061f7512e91bd42ec SHA512 2ab44da6d7c1fea4360ee4688302a5e3f823e0f1341168fbd35ba1942b7d225e1bfc745e09bfe8a0bd9ecd34dc340e23a2cf3fe7233872ea1c4d940af5aefba0
-EBUILD fio-3.17.ebuild 3558 BLAKE2B f99a7063106935000160b8402bdd6eb5ce06235364b68ffb05aa344fcfc73f695fdb4e5d305babb0899e1416f74703f3eb5f5efc8d75553305be0d2f0547429a SHA512 2219b427895295e6c4c5914c3eaf6c2fe71f2f1330196fc0debeef598d4d88006011172227d24a8798544ec41561ef8919663431746f05f782d115ebfbb9132b
-EBUILD fio-3.19.ebuild 3909 BLAKE2B e348a3e6275d6218cebe7b40d47d5e0e7f8e3f472d51e14333ee01bd4ede968e62fcf69552d30076756b2aee64d23ce92b8b30d70941ce7ff849cf386cb518be SHA512 a9b1b0c4a3e07b9abbe0aa147c22fd5144e04664a545bc2615428ef5ddf7933bcc27133e5fc3b44da9522f44a0349350e91b3867e3b94ca4e20c7b1ab52cbf4f
+EBUILD fio-3.16-r1.ebuild 3587 BLAKE2B 1bc4b3b50c36973a7ce0057e7901a7b810d73615338da7ffcfbabf60f2e249d06f5f400d09ef9b6b7848c7b9dee576032878d68a0e7715468e5fd23afa5ce0f6 SHA512 88a754dca79da6c8ebfa6b7a52590e8eaec0f103865eac17921da6787ef2d16b34358d1567fb641b2957addd1cf1768c55d3fea918ccdd2308c0ca8a4d3c6680
+EBUILD fio-3.16.ebuild 3536 BLAKE2B 2103340435d0bab73419f187554e6d1d466f6cd9b9cb67acb39571b626ce8bfe9cc9f3d68be8fd63036d4d45f06fae1bae34999da398c27283358ba0b34784ae SHA512 e033276c0f77a6fb04b94ed298f1a9ef371c28c861a4969fc04592fa6226bb48f0b6b5d56d0d4a293ad595755fab3dac978edfede30cf0ff770bef3b32a728dc
+EBUILD fio-3.17-r1.ebuild 3944 BLAKE2B 332569e86cb7542fe3003acd4eecc2fceb34d987db50f7bb1c3343231fdd2cb8b7f5cfef993f328a8ea34d440a32b78bf38a60f2524ad761931ec511189fb67d SHA512 fec9f05a86081b670fa5f995f3fd3a4afe084ad9f09d92a6d5d4cbd3b5a168580f5208da64da6a8a186347bf64c8f4029dee7e0d9047e15454d644a5a889c317
+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.7.ebuild 3006 BLAKE2B 0803b0f384761f77702d0e844767152c2f23f76291a3685bc2364d2a7dd2b781ea2170ec0da781ed4017c4821953b6d7a5ff7abfd1beac65687de2487a240724 SHA512 bc261cda042724608ec4e89e5b16bd96799d3ca72e87e19d32f3d95e30f6ca36f7d5e1ece54a125aaea7ddad49a59ae96b7ef52e5177fd158b5f934a15590b91
+EBUILD fio-3.7.ebuild 2996 BLAKE2B 66bbc26691006fe8d796009b2260ee768a251e462280d5c0fb7871a96bd67fd9955a02624ecee60ec34fec2218cb89ae5c782ee87dd237f6f9d5d77698dec482 SHA512 7cc3d4a80c9f608da5d5c8da831f1acd46e0fcb8ac90808f24cc876203e831317b19d4778d951db0e1bfacf73d96acc4c1526095967d198263bbb0f89c73bf46
 MISC metadata.xml 1000 BLAKE2B b31d96139431d807a30a3d310a259aee985e0bcbc8bd8a0ca55951aa9fd7d11441e837a2fce8f92c8f53601bcdebc64b432d93bab2ff976e6a1d19726e91a853 SHA512 d2c849aae5d4c80bce349d6f34de456602cbb04a0c670e60a126a7ff2e77b0e48b66d08aecfe0ad9f75b10a580a8f2e9214a0864310abff066d6d06077ba6613
diff --git a/sys-block/fio/fio-3.16-r1.ebuild b/sys-block/fio/fio-3.16-r1.ebuild
index 2538a0046ceb..f77ee340c37e 100644
--- a/sys-block/fio/fio-3.16-r1.ebuild
+++ b/sys-block/fio/fio-3.16-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit python-r1 toolchain-funcs
 
diff --git a/sys-block/fio/fio-3.16.ebuild b/sys-block/fio/fio-3.16.ebuild
index cf261cd6263b..fa28576751af 100644
--- a/sys-block/fio/fio-3.16.ebuild
+++ b/sys-block/fio/fio-3.16.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit python-r1 toolchain-funcs
 
diff --git a/sys-block/fio/fio-3.17-r1.ebuild b/sys-block/fio/fio-3.17-r1.ebuild
index 87a629536db1..213a718797a3 100644
--- a/sys-block/fio/fio-3.17-r1.ebuild
+++ b/sys-block/fio/fio-3.17-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit python-r1 toolchain-funcs
 
diff --git a/sys-block/fio/fio-3.17.ebuild b/sys-block/fio/fio-3.17.ebuild
index 7da716589b33..49775e5a6365 100644
--- a/sys-block/fio/fio-3.17.ebuild
+++ b/sys-block/fio/fio-3.17.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit python-r1 toolchain-funcs
 
diff --git a/sys-block/fio/fio-3.19.ebuild b/sys-block/fio/fio-3.19.ebuild
index fc1834df0b55..e9762f3cd8dd 100644
--- a/sys-block/fio/fio-3.19.ebuild
+++ b/sys-block/fio/fio-3.19.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit python-r1 toolchain-funcs
 
@@ -16,7 +16,7 @@ SRC_URI="https://brick.kernel.dk/snaps/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm ~ia64 ppc ppc64 x86"
 IUSE="aio curl glusterfs gnuplot gtk libressl numa python rbd rdma static tcmalloc zlib"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
 	libressl? ( curl )
diff --git a/sys-block/fio/fio-3.7.ebuild b/sys-block/fio/fio-3.7.ebuild
index f97099be414c..d3a0e110fd2d 100644
--- a/sys-block/fio/fio-3.7.ebuild
+++ b/sys-block/fio/fio-3.7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit eutils python-r1 toolchain-funcs
 
diff --git a/sys-block/gparted/Manifest b/sys-block/gparted/Manifest
index dcd439809a7d..7f6e19602005 100644
--- a/sys-block/gparted/Manifest
+++ b/sys-block/gparted/Manifest
@@ -1,5 +1,3 @@
-DIST gparted-1.0.0.tar.gz 3980258 BLAKE2B 4c0e7c36e2cd4dde68ee27b67e11a529c27fd22f0d93f6a8d1c6932b3728eead9c8aa282ff7e26c7e9922f0f7991ab3c5d72a7bd968708aac2c6b1e7f59bb5a5 SHA512 88eef4e4fbd51d9a9a3bdfb0a9738f6957ec5cbc21c2f93febf0d4cfe927e0ae3cb8cb1a9b2ca956a55dc62b9228ec76107e3e4701623be6474c99678c9197be
 DIST gparted-1.1.0.tar.gz 4032829 BLAKE2B d47d45e77a3d9dc29e9fa0428aaa7c12bb863cb70ac11f4055cbcc0a0fde8019fbb20266b7f810d6a47c5239248486049c8e9813ead8e88081dd16f445da036a SHA512 afaad690fccbec7385b078a299b78bf4f0f83999e2661f89cb97f9e8f2b30ee41f0535450075e3a7174967e77c75024df78863d0d90d5e8dc726a487b4ae0bae
-EBUILD gparted-1.0.0.ebuild 2121 BLAKE2B 372a5500afb8252587dc60586b4cd9c4b42e1f29fc02905f994f1123498a7e76336a0e00037f5cd9b84cc1d9e77ca86b79adb1c5f7233b4d768c291797b020d0 SHA512 3e23f1a9f9ae949003150289d85d140ed6743d9d2894678a1d5346cd9200ddb9426c94e6645c000b82de71c87e8130bbd637833d49417315d30d33b38783cf3b
 EBUILD gparted-1.1.0.ebuild 2165 BLAKE2B 27462145c570c272e776d505eabfa082fe2b345fa964c43000d82e30a5ceb59477fb5f6f7cc3ec12390d817e58fba2a106c4cd1eae9df57ddb3fce240d9a0349 SHA512 abd09f8d33e728da1b433226697501fb21dff98550db0bed7aa9750491539f127feb44b7a06128c5e370a160af7405994464373ddcfa2005974286ec547bd8ef
 MISC metadata.xml 2003 BLAKE2B c1568f7b030ae6d3f0ddc3724424bac3701fd470a535c5cedb8c5fb01f2c7f4f20476075be0033dacaf59bc9797f155c7fecc7ea4ef19ac4545454c275b82010 SHA512 03814c5741c01c342ebaa7b4923253f8efeb7beeb5026866dbc8a28ce1b3c3562c06eff108a15f2365070d389a84fe6d498bde39ed0632a63cf1eef412b3b97b
diff --git a/sys-block/gparted/gparted-1.0.0.ebuild b/sys-block/gparted/gparted-1.0.0.ebuild
deleted file mode 100644
index 5ba55bc8b202..000000000000
--- a/sys-block/gparted/gparted-1.0.0.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="Gnome Partition Editor"
-HOMEPAGE="https://gparted.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+ FDL-1.2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86"
-IUSE="btrfs cryptsetup dmraid f2fs fat hfs jfs kde mdadm ntfs policykit reiserfs reiser4 udf wayland xfs"
-
-COMMON_DEPEND="
-	!policykit? (
-		kde? ( >=kde-plasma/kde-cli-tools-5.8.6-r1[kdesu] ) )
-	policykit? ( >=sys-auth/polkit-0.102 )
-	>=dev-cpp/glibmm-2.56.1:2
-	>=dev-cpp/gtkmm-3.24:3.0
-	>=dev-libs/glib-2.58.3-r1:2
-	>=sys-block/parted-3.2:=
-	>=dev-libs/libsigc++-2.10.1:2
-"
-RDEPEND="${COMMON_DEPEND}
-	>=sys-apps/util-linux-2.33.2
-	>=sys-fs/e2fsprogs-1.44.5
-	btrfs? ( sys-fs/btrfs-progs )
-	cryptsetup? ( sys-fs/cryptsetup )
-	dmraid? (
-		>=sys-fs/lvm2-2.02.116
-		sys-fs/dmraid
-		sys-fs/multipath-tools )
-	f2fs? ( sys-fs/f2fs-tools )
-	fat? (
-		sys-fs/dosfstools
-		sys-fs/mtools )
-	hfs? (
-		sys-fs/diskdev_cmds
-		virtual/udev
-		sys-fs/hfsutils )
-	jfs? ( sys-fs/jfsutils )
-	mdadm? ( sys-fs/mdadm )
-	ntfs? ( >=sys-fs/ntfs3g-2016.2.22-r2[ntfsprogs] )
-	reiserfs? ( sys-fs/reiserfsprogs )
-	reiser4? ( sys-fs/reiser4progs )
-	udf? ( sys-fs/udftools )
-	wayland? ( x11-apps/xhost )
-	xfs? ( sys-fs/xfsprogs sys-fs/xfsdump )
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	>=dev-util/intltool-0.51.0-r2
-	dev-util/itstool
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_configure() {
-	gnome2_src_configure \
-		--enable-doc \
-		--enable-online-resize \
-		$(use_enable wayland xhost-root) \
-		GKSUPROG=kdesu \
-		ac_cv_prog_have_scrollkeeper_update=no
-}
-
-src_install() {
-	gnome2_src_install
-
-	local _ddir="${D}"/usr/share/applications
-	local _bdir="${D}"/usr/bin
-
-	if ! use policykit; then
-		if use kde; then
-			cp "${_ddir}"/gparted{,-kde}.desktop || die
-			cp "${_bdir}"/gparted{,-kde} || die
-			sed -i -e '/Exec/ s:gparted:gparted-kde:' "${_ddir}"/gparted-kde.desktop || die
-			echo 'OnlyShowIn=KDE;' >> "${_ddir}"/gparted-kde.desktop || die
-		fi
-	else
-		sed -i -e 's:kdesu::' "${_bdir}"/gparted || die
-	fi
-}
diff --git a/sys-block/kvpm/Manifest b/sys-block/kvpm/Manifest
deleted file mode 100644
index 80d44a302a47..000000000000
--- a/sys-block/kvpm/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX kvpm-0.9.9-glibc-sysmacros.patch 1858 BLAKE2B c5be79e19b94f62918cd5fd337ab228ed5c3d3d00e39788df16dfabc144d842509efc980aeeabf17b3a454f4147223cec97de7346c03122fee4776586d69df03 SHA512 b3cce6fe24d9df4e5f477b25e80403d0359f7f7b62f3c1da08fd8bfd534877cad6545f7807615518fc1f5f48b998776f0217541ba4aaa266842ae2ff67db96c5
-DIST kvpm-0.9.10.tar.gz 1313153 BLAKE2B ea2e668f493a845fe48e2bfafe883ca1739a2956da1ac734ac245e7768f3b0ce021d995ad6efd71c436546632433523cfe0886d7073598a193993f9bf09dd70a SHA512 825bc7f24e4b6f6aae9f218075cd7a24a8fed9ae34d0cc08ac136db501eba1abb5925aaaa937ae9d59869afb41b9f36737fd8c47bd6b560be94fbe90feba37d4
-EBUILD kvpm-0.9.10-r1.ebuild 967 BLAKE2B 8145669c4183703af70604675c0eeb7bd02b643c5718972dc1114cd26dd153cf14e2d8efc5fbef4a2ef5e3be228c1da273de737ce5cbea83d353e4e4b4627abe SHA512 793c2ede684b4402c69da33c934303782ba6955430bae6f843ff18118f78a7a86b80625258ff5a7079962fe942c67c28ef42eb99ec2f4f71dfc39b8bcf2d46dc
-MISC metadata.xml 323 BLAKE2B d1c0d5e641448344d822f1fb2271976a600bee171fd7a4de5ea51f36aa81f42006b54465104821f9a96915bd7ecc0e941bd0271734153e408c69d564602b887e SHA512 f899a6f220dcfe6fad97dfe7e210228e3ae14cc75f70bc54ab79b54a4400869239ed3dfe892c61ebcdb9f3a8eb124246e5d85f57fa4ee60491a2f3973b3ef47c
diff --git a/sys-block/kvpm/files/kvpm-0.9.9-glibc-sysmacros.patch b/sys-block/kvpm/files/kvpm-0.9.9-glibc-sysmacros.patch
deleted file mode 100644
index 8b8c1be2972b..000000000000
--- a/sys-block/kvpm/files/kvpm-0.9.9-glibc-sysmacros.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-diff -Naur kvpm-0.9.9.orig/kvpm/logvol.cpp kvpm-0.9.9/kvpm/logvol.cpp
---- kvpm-0.9.9.orig/kvpm/logvol.cpp	2014-09-09 01:34:06.000000000 +0200
-+++ kvpm-0.9.9/kvpm/logvol.cpp	2016-04-19 20:44:09.775924549 +0200
-@@ -16,6 +16,7 @@
- #include "logvol.h"
- 
- #include <sys/types.h>
-+#include <sys/sysmacros.h>
- #include <sys/stat.h>
- #include <fcntl.h>
- #include <errno.h>
-diff -Naur kvpm-0.9.9.orig/kvpm/misc.cpp kvpm-0.9.9/kvpm/misc.cpp
---- kvpm-0.9.9.orig/kvpm/misc.cpp	2014-01-29 07:39:53.000000000 +0100
-+++ kvpm-0.9.9/kvpm/misc.cpp	2016-04-19 20:42:32.496964783 +0200
-@@ -15,6 +15,7 @@
- #include "misc.h"
- 
- #include <sys/types.h>
-+#include <sys/sysmacros.h>
- #include <sys/stat.h>
- #include <fcntl.h>
- #include <errno.h>
-diff -Naur kvpm-0.9.9.orig/kvpm/processprogress.cpp kvpm-0.9.9/kvpm/processprogress.cpp
---- kvpm-0.9.9.orig/kvpm/processprogress.cpp	2014-01-29 20:48:04.000000000 +0100
-+++ kvpm-0.9.9/kvpm/processprogress.cpp	2016-04-19 20:43:20.139434830 +0200
-@@ -19,6 +19,7 @@
- #include "progressbox.h"
- 
- #include <sys/types.h>
-+#include <sys/sysmacros.h>
- #include <signal.h>
- 
- #include <KApplication>
-diff -Naur kvpm-0.9.9.orig/kvpm/storagebase.cpp kvpm-0.9.9/kvpm/storagebase.cpp
---- kvpm-0.9.9.orig/kvpm/storagebase.cpp	2014-01-29 07:39:53.000000000 +0100
-+++ kvpm-0.9.9/kvpm/storagebase.cpp	2016-04-19 20:43:36.869599894 +0200
-@@ -14,6 +14,7 @@
- 
- 
- #include <sys/types.h>
-+#include <sys/sysmacros.h>
- #include <kde_file.h>
- 
- #include <QByteArray>
-diff -Naur kvpm-0.9.9.orig/kvpm/storagepartition.cpp kvpm-0.9.9/kvpm/storagepartition.cpp
---- kvpm-0.9.9.orig/kvpm/storagepartition.cpp	2014-01-29 07:39:53.000000000 +0100
-+++ kvpm-0.9.9/kvpm/storagepartition.cpp	2016-04-19 20:43:56.465793229 +0200
-@@ -17,6 +17,7 @@
- #include "storagepartition.h"
- 
- #include <sys/types.h>
-+#include <sys/sysmacros.h>
- #include <kde_file.h>
- 
- #include <QDebug>
diff --git a/sys-block/kvpm/kvpm-0.9.10-r1.ebuild b/sys-block/kvpm/kvpm-0.9.10-r1.ebuild
deleted file mode 100644
index 7ce1ea7a7846..000000000000
--- a/sys-block/kvpm/kvpm-0.9.10-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK_DIR="docbook"
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm
-
-DESCRIPTION="GUI front end for Linux LVM2 and GNU parted based on KDE Frameworks"
-HOMEPAGE="https://sourceforge.net/projects/kvpm/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="5"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kdelibs4support-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	sys-apps/util-linux
-	>=sys-block/parted-2.3
-	>=sys-fs/lvm2-2.02.120
-"
-RDEPEND="${DEPEND}
-	!sys-block/kvpm:4
-"
-
-PATCHES=( "${FILESDIR}/${PN}-0.9.9-glibc-sysmacros.patch" )
diff --git a/sys-block/kvpm/metadata.xml b/sys-block/kvpm/metadata.xml
deleted file mode 100644
index 6f8f1b1869dd..000000000000
--- a/sys-block/kvpm/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">kvpm</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/sys-block/mbuffer/Manifest b/sys-block/mbuffer/Manifest
index 7d59d39a2d6e..26f57902b520 100644
--- a/sys-block/mbuffer/Manifest
+++ b/sys-block/mbuffer/Manifest
@@ -13,5 +13,5 @@ EBUILD mbuffer-20171011.ebuild 1443 BLAKE2B 2752db5ce538759ce96ac9f60a06f4e1ffb9
 EBUILD mbuffer-20181119.ebuild 1483 BLAKE2B 724bc74a84456a8f29f73abc3806e03419543499073a41a753b54a00d003be52e5cc257136a45fac25f52953f6ed059faf0ae4b298a22e45bf6b5ed72ae09a14 SHA512 574cd79b156bf8639605f6a3b9c9087184dc72337922f60b9eab376636ad179274a1c6496d34c46981d1f223cfd78078c183d5fbc172c9b423c3657543b64c23
 EBUILD mbuffer-20190127.ebuild 1491 BLAKE2B d2635098accf7f2c509094777439b277009cdb2b83a073e66f8a8e5db05e6ce6407fbbe67a25c046663619e495bbd58e0991a621849085d038116ffb201786f4 SHA512 d7a00cc2e064a462467f72a2a54ebc1e119b904a72a2240ad773b2e699db1ac15fcad277e26a48bfc12070126aaf4497361649b3a44d7719e2c3b5c661f8c91c
 EBUILD mbuffer-20190725.ebuild 1493 BLAKE2B d5743f34893f47ce5d20480232023a4f709c4584f381c913b7f7d3d738600cac3361139b36fc9457391ac0f15a529be0fc36329fc670804f0551acca5c388f71 SHA512 9304e734315e4f723545f44ef1f044b18aee2c284bdf8131dbf7c41b84b37a2e8e3ad178d5a1ecdffce98c03d4342320b3ba1d73fcec4121376421d85589068d
-EBUILD mbuffer-20191016.ebuild 1491 BLAKE2B 5e18cdd5b9e7926f115c4570a585a30aa36a3654c498b76739fff00762c0b91189f1069d6cc119cafeead254ed7833794d4381135104c134aabf2e2655a86fa7 SHA512 2a9dcecb51baf8e2b6438653f3e830751adcc3f90311f19e68ac3a38e6af5b1007d60b3781ebe93b2d39d01edf42f967b8284d3032fb775775a988cc0eb0f6d1
+EBUILD mbuffer-20191016.ebuild 1498 BLAKE2B 4f33e291d420b1a7f7a752c717ac09820475fd1009cc0971005d9d4a61370e0957b511504bcb61b331e7d01e8da788386ab59de74acc62360a962e9f754324f5 SHA512 f1d5d1fc6b019d1a07213bc3db6969df17796189451333aa41cef2601ca239197af757bfcd6c0001656dd337e086fd84bf0f09a72deb1b5db93cff848d224a37
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-block/mbuffer/mbuffer-20191016.ebuild b/sys-block/mbuffer/mbuffer-20191016.ebuild
index 100537bee29c..07d830948310 100644
--- a/sys-block/mbuffer/mbuffer-20191016.ebuild
+++ b/sys-block/mbuffer/mbuffer-20191016.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://www.maier-komor.de/software/mbuffer/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc x86"
 IUSE="debug ssl test"
 
 REQUIRED_USE="test? ( ssl )"
diff --git a/sys-block/open-iscsi/Manifest b/sys-block/open-iscsi/Manifest
index a8e21c967a4d..3a0887621d55 100644
--- a/sys-block/open-iscsi/Manifest
+++ b/sys-block/open-iscsi/Manifest
@@ -10,6 +10,7 @@ AUX open-iscsi-2.0.874-musl-ethtool-compat.patch 2230 BLAKE2B fada90cbf8173364b7
 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.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
@@ -19,5 +20,5 @@ EBUILD open-iscsi-2.0.873-r1.ebuild 2545 BLAKE2B c6b89937392718933e75616429acab0
 EBUILD open-iscsi-2.0.875.ebuild 3714 BLAKE2B 4d50d94574f3e16ef32a94287048719d83085457b66157ab402bc4c1b8674575910a3275baeef1cd462e8b6cdfa8efd37acb55dcac08e0d47a130d7fea6e2603 SHA512 e82f636a9c91d8dce36d248de9f2e2123505435dd15f1ac9273ccf6628641e8809ff9fd6cfd8b037b88699641e49170d145b2d8fa349156ff6aad2d833cba6a9
 EBUILD open-iscsi-2.0.878.ebuild 3996 BLAKE2B 9bd9e7b64838e3e3e02f0e7fc00706f580687db254bde71c89aa547050025ed1c7d2d10b8f3727d091adf051cc3f73eea456fea28c5bb92c5b11feda56590ee1 SHA512 3da8ce679baa5a0adcf65b553f65cbbe6d22970c409c02bf0f25f8b9bb4b4c9cbda3aaafd85d38289ef437fb08cb53cec83ecdd2634889769e47c852835d1b2d
 EBUILD open-iscsi-2.1.0.ebuild 3996 BLAKE2B 9bd9e7b64838e3e3e02f0e7fc00706f580687db254bde71c89aa547050025ed1c7d2d10b8f3727d091adf051cc3f73eea456fea28c5bb92c5b11feda56590ee1 SHA512 3da8ce679baa5a0adcf65b553f65cbbe6d22970c409c02bf0f25f8b9bb4b4c9cbda3aaafd85d38289ef437fb08cb53cec83ecdd2634889769e47c852835d1b2d
-EBUILD open-iscsi-2.1.1.ebuild 4035 BLAKE2B e4598fce1ae544c5c9ede913c7563d18709cfa680af073560d6c0c698b2391db53d031042e793405b0af5c1b6f1aa8a412a4425acb09d06b4d1e97c5f04e4e09 SHA512 edbeca592c733d952c707d997d5e97a2d1fa313e4e03efc8a0f512e489615cac4ad0c62173dcad6aacf6ff831e698da32734451c90f054d048911a91a008ffd6
+EBUILD open-iscsi-2.1.1.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.1.1-Makefiles.patch b/sys-block/open-iscsi/files/open-iscsi-2.1.1-Makefiles.patch
new file mode 100644
index 000000000000..02e651e27c21
--- /dev/null
+++ b/sys-block/open-iscsi/files/open-iscsi-2.1.1-Makefiles.patch
@@ -0,0 +1,78 @@
+--- a/libopeniscsiusr/Makefile
++++ b/libopeniscsiusr/Makefile
+@@ -44,7 +44,7 @@ EXTRA_MAN_FILES = libopeniscsiusr.h.3
+ OBJS = context.o misc.o session.o sysfs.o iface.o idbm.o node.o default.o
+ 
+ CFLAGS ?= -O2 -g
+-CFLAGS += -Wall -Werror -Wextra -fvisibility=hidden -fPIC
++CFLAGS += -Wall -Wextra -fvisibility=hidden -fPIC
+ CFLAGS += $(shell $(PKG_CONFIG) --cflags libkmod)
+ 
+ LDFLAGS += $(shell $(PKG_CONFIG) --libs libkmod)
+--- a/usr/Makefile
++++ b/usr/Makefile
+@@ -35,7 +35,7 @@ endif
+ PKG_CONFIG = /usr/bin/pkg-config
+ 
+ CFLAGS ?= -O2 -g
+-WARNFLAGS ?= -Wall -Wextra -Werror -Wstrict-prototypes -fno-common
++WARNFLAGS ?= -Wall -Wextra -Wstrict-prototypes -fno-common
+ CFLAGS += $(WARNFLAGS) -I../include -I. -D_GNU_SOURCE \
+ 	  -I$(TOPDIR)/libopeniscsiusr
+ CFLAGS += $(shell $(PKG_CONFIG) --cflags libkmod)
+@@ -76,9 +76,9 @@ iscsistart: $(ISCSI_LIB_SRCS) $(INITIATOR_SRCS) $(FW_BOOT_SRCS) \
+ 		iscsistart.o statics.o
+ 	$(CC) $(CFLAGS) $^ -o $@ -lcrypto -lrt $(LDFLAGS) $(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
diff --git a/sys-block/open-iscsi/open-iscsi-2.1.1.ebuild b/sys-block/open-iscsi/open-iscsi-2.1.1.ebuild
index 43f3ee2b89ff..d7ff6b52509f 100644
--- a/sys-block/open-iscsi/open-iscsi-2.1.1.ebuild
+++ b/sys-block/open-iscsi/open-iscsi-2.1.1.ebuild
@@ -31,7 +31,7 @@ BDEPEND="virtual/pkgconfig"
 REQUIRED_USE="infiniband? ( rdma ) || ( rdma tcp )"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-2.0.876-Makefiles.patch"
+	"${FILESDIR}/${PN}-2.1.1-Makefiles.patch"
 )
 
 pkg_setup() {
diff --git a/sys-block/storcli/Manifest b/sys-block/storcli/Manifest
index f55ac16e0a3c..88cfb392a76a 100644
--- a/sys-block/storcli/Manifest
+++ b/sys-block/storcli/Manifest
@@ -9,6 +9,7 @@ DIST storcli-7.0606.zip 36634159 BLAKE2B 56cae14537872ef23d8ddc6a0790b727abdf4ab
 DIST storcli-7.0709.zip 25844769 BLAKE2B f44791d0813f348068a89a14a0ea457667ab8e224da09a458bfd1126f5e1d9f19655f5392a8d2a8a04ae07f76fc3c91abcdbd48a058c8e9d517c504de8688e66 SHA512 c3995110b592bbf6e58a0e54f62ddbdbb025c6d27ce56111a40d9eb04b7d5ee7a9bfc76e449b0b4900e1082f20df8e06a852a3fe0efc1114158d104036f6033e
 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
 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
@@ -17,5 +18,6 @@ EBUILD storcli-7.0504.ebuild 2209 BLAKE2B fac3eb79205c9826a12fbd058bcff11233cfe7
 EBUILD storcli-7.0606.ebuild 2486 BLAKE2B 0873b7c99026c2d3eee5c07bfa960c1b087ccbd2157809ab7682b41d198bd0752132752a4f528116587a0dab594bd55a574ddd20d8f341a7f7f30fe84229036e SHA512 8cefa565d87a6abe22d8290eadb1a675a2e4791a507f68ff56cd28857b31a15a409d91c550174b66e8ccc7e4de99d790894f32f1e2b73b525e8110a5d02298d1
 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 1824 BLAKE2B 2260a77fb615226590aace79de8fd7352fbf7c0afd8ed24b30999fc90ade59d7275590393f678c41669eb2762d36f1cdc250d9757ead0a62a4d97ec41eac8e51 SHA512 93a47858daf64746f80256a7f78a3b29673ff2dca4e8b473c61981339c776932eff20e4fef99af429d13a73fc6d890a7458466e11e741b6c7342c59417859122
+EBUILD storcli-7.1211.ebuild 1822 BLAKE2B eeedf7c5527b0e14c6eb0ae2c619e9d1d941f42a18fafaa37d293a788a43c59f7967a67e2158498439a89ae7d6420ca8f673254d2e6f6a8efaa7811a32bb91b3 SHA512 f5b8660ae5f859ec7ae5e9ae3fb3b142e004be55c0c1a1c357ea70204f77b9cb0248c635305e5c49361a0de8b3f92fc44dab198c03483b107679ecf311abcccb
+EBUILD storcli-7.1316.ebuild 1824 BLAKE2B ef8f9ce33ab74f75daf9b914c650adbc26a6b2443da290c8a8665c0f97895e383d0a0edb88e455c5e053232d31dd1cadaee9af30794574c51e5dccf7f98eda95 SHA512 44dc99c79a34a473ad0131b4cff5b7514261668eb7717e64950d8b60a943621dd54b08659f7c8058cf9827e3dd991d64653e001d67b04ef85056b58e80ee5897
 MISC metadata.xml 251 BLAKE2B fb85d245662fa1577cfe1d77526bd34fb2a674dd447192f2defe78b751423e3d14ae73efd3ac0e1e5e6fdb6259622a782e724ec77021faf526509f199dd20d61 SHA512 46942a98ef7e36470d1169a5bc8839d25603e33c143cd36327a8a85fc14cb6bfb32247eb7608d92cc58a06cc8eef5bd64d6ec2d21e69a88632e4b936598aa772
diff --git a/sys-block/storcli/storcli-7.1211.ebuild b/sys-block/storcli/storcli-7.1211.ebuild
index d96942c7205d..c2aac60238c5 100644
--- a/sys-block/storcli/storcli-7.1211.ebuild
+++ b/sys-block/storcli/storcli-7.1211.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -14,7 +14,7 @@ SRC_URI="https://docs.broadcom.com/docs-and-downloads/raid-controllers/raid-cont
 
 LICENSE="Avago LSI BSD"
 SLOT="0/7.12"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/sys-block/storcli/storcli-7.1316.ebuild b/sys-block/storcli/storcli-7.1316.ebuild
new file mode 100644
index 000000000000..dc1d0ad80e74
--- /dev/null
+++ b/sys-block/storcli/storcli-7.1316.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit pax-utils
+
+# Upstream is still using strange version numbers
+MY_PV="007.1316.0000.0000"
+
+DESCRIPTION="MegaRAID StorCLI (successor of the MegaCLI)"
+HOMEPAGE="https://www.broadcom.com/support/download-search?dk=storcli"
+SRC_URI="https://docs.broadcom.com/docs-and-downloads/raid-controllers/raid-controllers-common-files/${MY_PV}_Unified_StorCLI.zip -> ${P}.zip"
+
+LICENSE="Avago LSI BSD"
+SLOT="0/7.13"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="app-arch/unzip"
+
+MY_STORCLI_BASEDIR="/opt/lsi/storcli"
+
+QA_PRESTRIPPED="${MY_STORCLI_BASEDIR:1}/storcli
+	${MY_STORCLI_BASEDIR:1}/storcli32"
+QA_PREBUILT=${QA_PRESTRIPPED}
+
+src_unpack() {
+	mkdir srcfiles || die
+	pushd srcfiles &>/dev/null || die
+	default
+	mv 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}"
+
+	if use x86; then
+		doexe storcli
+	elif use amd64; then
+		# 32-bit version is less crashy than the 64bit (bug #656494)
+		newexe storcli storcli32
+		newexe storcli64 storcli
+	fi
+
+	dosym "${MY_STORCLI_BASEDIR}"/storcli /usr/sbin/storcli
+
+	pax-mark m "${D}${MY_STORCLI_BASEDIR}"/storcli
+}
diff --git a/sys-block/targetcli-fb/Manifest b/sys-block/targetcli-fb/Manifest
index 04356c51b6ec..7d68ed81e57e 100644
--- a/sys-block/targetcli-fb/Manifest
+++ b/sys-block/targetcli-fb/Manifest
@@ -1,5 +1,5 @@
 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
 EBUILD targetcli-fb-2.1.49.ebuild 815 BLAKE2B d40abe7dabb6eef54e2bc65696e4656acd7277b9da245e52e9c318c92c2e61cab49a38ee5dc8721744a28c952a58df371efb0e23ee67c2c27d5e70e93021206f SHA512 521a6fa706fb91f7101afe8bc2ae4b183613eec635584a39aab2ec8296671c77bf8734d2bebbf8c8938d73a254cf7a4db38126aa3340e8a137ee2b4ef9d71d32
-EBUILD targetcli-fb-2.1.51.ebuild 714 BLAKE2B 382ad6f05bd4a4e1896c856a9aef2f028744e42384c5ecc69d3dee59c8833380aca80193ed1747d49c61355fbda21f856ee353642af4d46e9ab6c7d6d0e31a80 SHA512 fce72a63825c1dc45d61cacdeb0e9f4a0740ad603a624e56281c7ff5d9c5394091e4d3e869dee06bbd9c3b49cd1ddf5bda4ac93754b858124820060b46be8569
+EBUILD targetcli-fb-2.1.51.ebuild 712 BLAKE2B 43a884cbc45f427f3df861cbb9a2d784cf6eb04758d9df6b8373cce8777da27587233f55df438a702848e11c4c685df4e32683888da87679bdb33c14b7531b72 SHA512 981c5a93d85908b87a05d59330736ae758a13e40c9027f8538d75f449e65767796dedcfca97b0ce87b7b641b462f2b5de0f08656271e820fcf7b6711fafcac32
 MISC metadata.xml 712 BLAKE2B 7b038add297ff7f92e9c83df1d3bd493e169b9dbc42258c16b30884377f6538bb46151981779b2facbc3ced0a523c51cfbf9f3594a79152fc713b0c4d1816b57 SHA512 6c9af32d85c643e798be9215e7240cc2767abf09163a713d75ad29a0c5c30f6c7504ece5403c0acd1c131e97953d3c937d5488d0e70daf3717b9e275aeca844a
diff --git a/sys-block/targetcli-fb/targetcli-fb-2.1.51.ebuild b/sys-block/targetcli-fb/targetcli-fb-2.1.51.ebuild
index fe0c14a548f7..a26319993fd7 100644
--- a/sys-block/targetcli-fb/targetcli-fb-2.1.51.ebuild
+++ b/sys-block/targetcli-fb/targetcli-fb-2.1.51.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/open-iscsi/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="dev-python/configshell-fb[${PYTHON_USEDEP}]
 	dev-python/pygobject:3[${PYTHON_USEDEP}]
diff --git a/sys-block/tgt/Manifest b/sys-block/tgt/Manifest
index 68225ae7d8bc..d3129869a3f3 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 1511 BLAKE2B 9f76a2b4a07d081888e32a86449edb29519d9469b89bdd36c743af49d1e40dcf676765e161ad0935dc25b1663084d2f66f1e0f267afa005bc4ba8a2577f510f2 SHA512 24a3abc92a2ab714f02282d127fb62468b5d21f00194a5b19396bcc2e3498bef3a2a2c1d25411e195f654fd4c559abbbfa3043be823982030fff93127d8cebc2
+EBUILD tgt-1.0.79.ebuild 1516 BLAKE2B 85fe2739328cbb7e4d0a6cbee37e00da4369920a761d743b6cbe7f4fc57b4b974fafa377ce110d83e6f06887a2c4f87c33cc024026d709f3c6ecb6e2b6b0221a SHA512 6f104551138a79bc4c71495ab7f5372d62b4b960a06c60b517732606d3345ba3f05eea285467420f42456f1702e862a836f6f6d1498b13f23bbf8fb4981035dc
 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 dddcd494c5e4..0e5097a2420e 100644
--- a/sys-block/tgt/tgt-1.0.79.ebuild
+++ b/sys-block/tgt/tgt-1.0.79.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/fujita/tgt/tarball/v${PV} -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm64 ~ppc x86"
 IUSE="fcoe fcp ibmvio infiniband rbd"
 
 CDEPEND="dev-perl/Config-General