gentoo Easter resync : 12.04.2020

46 files changed, 330 insertions, 437 deletions

diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz
index 6a8e8f9d011e..dd010cd69ba6 100644
--- a/sys-block/Manifest.gz
+++ b/sys-block/Manifest.gz
diff --git a/sys-block/arcconf/Manifest b/sys-block/arcconf/Manifest
index c9a92c995111..9e5845489ac4 100644
--- a/sys-block/arcconf/Manifest
+++ b/sys-block/arcconf/Manifest
@@ -1,7 +1,7 @@
 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_03_23668.zip 83570233 BLAKE2B 938c7c7dcc3cd6d4a0cb85b3240be5b61397b57c9bd3fdc2fd2541d5cae543f1a31613e1fa0281c1ab3be3f37e794ce16820b0e0d63a8e6671599352a79eb80f SHA512 5b1f173784f4d08a929fb71371baf4340e23c1cb9eb7ba9728a44e32a23ca268ec3f984f44e13b6ce235ee07e49a5befb1eebc67fc6f23736425ce79501a373c
+DIST arcconf_v3_04_23699.zip 89105029 BLAKE2B 338923a508cb3b55d93128383b02a1bc650436689c29af6c2658c13af6789cacf89354ca2f5d79d84cc485e2559b26929269f591cf99412427f88ba5ca872303 SHA512 d87ca4edae53505fbfd1042df4ae38a9d8ff51cbaaecfe2de45d136d9a8f3a7713b0104e126f281b02a61fb91f9188aa7846a31ab51757cd0ff5cb91348fae80
 EBUILD arcconf-2.01.22270-r1.ebuild 976 BLAKE2B 0a01569201cfc356bf515ba378b473231ea071f5d158e75fc54f471bb4a30720045fb5efc5704e36095d948f6d4c0eac57992dcb46754ffd0e3bfe66c8eb0d9e SHA512 e47138663ccd6f0e1f89dc9481bbd0a866fb179aa6a06e12102931ca617c5d76c3103a421e161bbce23f01d372f09ad30cbdb3d4ea8e65590caa45ea4358f80b
 EBUILD arcconf-3.01.23531.ebuild 945 BLAKE2B 8558110c3399589ecb2d57d964b3a2bbe8fa7b0b170d01dbf779b8baccf26a1a01c9b2fd1d7f7da740b2cf4809565c055ef5092dd1e93df358cb0b963e7786f7 SHA512 3d762d943fecc99eb952789f246a51dacec22cf036fa2c601e291230a70ab2ff146c604977e3f58182e0500e25db5fa0fdfc99d6d49f92dd1e6870d1524446c5
-EBUILD arcconf-3.03.23668.ebuild 946 BLAKE2B e1a27185c17d2dac58d4fa740bb0d8a9cc8f15d6b387cb46e1ae9303356bb82afdfc5679ff4e8334b3e21069f3e1c058631473e473c2d074aa5b079eedbd7892 SHA512 4d0069bfde1a2cc946c3f9b4dc86d439b525624db8cc91befcd37e9efd500912b94d667543fb2c1772eb5c9e587485471743e105365f1fc76d8f6a6448daa305
+EBUILD arcconf-3.04.23699.ebuild 941 BLAKE2B 3d8809de6c21b18350f599eaca41cfcdd3dc7aaf14c0ad91d42cf30d5252fb58bcfa1e32e12d2bd8f717a8193d666973a898239e11afdc528eb76b062ac91b6f SHA512 b49c8b5b019535d5928be5d4a2686fb0c28c8c686ca7fca80912a99ab32aadb201fdd15510738f72c83ecaf34c7213472d5337503a31ae26e1b1beb805aaa86d
 MISC metadata.xml 819 BLAKE2B db0209c49563799b6e71389de7f139c9590406e24272bacd67f667fd544d66aedbf0869d4dc09ca1590601ab0f1a5393a618c408d66e3a447854f0f47df5f99a SHA512 a8e9ba3d80eb67f5ece7d1e1ef4dd7c77da021000daad99fdb191ec59aba378421c6a313a43c13560909fa08e1edbb68baeb700c5a8e012be0f60439a12c6182
diff --git a/sys-block/arcconf/arcconf-3.03.23668.ebuild b/sys-block/arcconf/arcconf-3.04.23699.ebuild
index 1595e76bab6f..fc4aaa9b7431 100644
--- a/sys-block/arcconf/arcconf-3.03.23668.ebuild
+++ b/sys-block/arcconf/arcconf-3.04.23699.ebuild
@@ -15,9 +15,9 @@ LICENSE="Microsemi"
 SLOT="0"
 KEYWORDS="-* ~amd64"
 
-DEPEND="app-arch/unzip"
+BDEPEND="app-arch/unzip"
 
-RESTRICT="fetch mirror bindist"
+RESTRICT="mirror bindist"
 
 S="${WORKDIR}/linux_x64"
 
diff --git a/sys-block/disktype/Manifest b/sys-block/disktype/Manifest
index a30fb64bc704..111309c26fcf 100644
--- a/sys-block/disktype/Manifest
+++ b/sys-block/disktype/Manifest
@@ -1,3 +1,3 @@
 DIST disktype-9.tar.gz 43809 BLAKE2B 9155705c02ad7a9c8c799d5b728517f9de9e837464e019f3c25aa74f6b784e634ea65c67bdb3817eb0bc816c494ada28968cf85885eaff2a49db14d430b9a4c1 SHA512 3642e35af55341db089d3b671ddecb026eca67a9f63ba55456a0c63c3fa611e3888104e5c14c18959435577a08d1fd93f1794fbb37e0d8118ab9be65f474bdf3
-EBUILD disktype-9.ebuild 534 BLAKE2B 070e5ad3cb864a93a88b3c4ea6d8af8765f36e8ec1869ce94a19be7e543cb1cce1d245c4ed251c87f15903a86bf55f0f1de68d154a875df90082348cc63650aa SHA512 9ddbec566f1bd38c319933c6e44959acda296b2a3ceee5fc9c4544aa43875ebef8a49eb22aa257b5b78f7e3983e5b2d0de2cc12f37a602f6826c0047eef3e02b
+EBUILD disktype-9.ebuild 528 BLAKE2B 11946cd15e0f707475612ce90a4a147cf804a4129b60ca5411734bb1e2c25fb8200436362180ddb79710599b0e4d9162fb29f5a20c8738b1a99c8aca781f64be SHA512 99b2179df96f55dfb5b721e528c58fd8cbbe92603bea2592bd72db2510c5e8e13c62c72bf2b591db4faa7369e2f1a1d1f5d7e37d29503e93ddf579e0642302e6
 MISC metadata.xml 1365 BLAKE2B fc972acd201480c3ee7defcec10d3f2392d40b8212c8457238fa4bfaf545e2452f9ffc814403ddeed23856e288c4175c9159fd77b794161635b5bf13d52fb92c SHA512 163cdd2d8b0f6bd22ee9cc4801a2bba0a89df27e1848182edcf1ab48d9c9fb066e5ae254437a2283d1a9b9c59f709c7b35330b4e4e12cbb965010b5ed8b62cc7
diff --git a/sys-block/disktype/disktype-9.ebuild b/sys-block/disktype/disktype-9.ebuild
index 4df6283ed744..a24eae149a3a 100644
--- a/sys-block/disktype/disktype-9.ebuild
+++ b/sys-block/disktype/disktype-9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/disktype/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm ppc sh sparc x86"
+KEYWORDS="amd64 arm ppc sparc x86"
 IUSE=""
 
 src_compile() {
diff --git a/sys-block/fio/Manifest b/sys-block/fio/Manifest
index 8a11fee5c57c..5fa88cfd1692 100644
--- a/sys-block/fio/Manifest
+++ b/sys-block/fio/Manifest
@@ -6,14 +6,16 @@ DIST fio-2.15.tar.bz2 545809 BLAKE2B 163530097a6ff08016c977a328bc499d052c423890c
 DIST fio-2.16.tar.bz2 558662 BLAKE2B cbc6e6000bd497fc92779c34688c0862f3adccd7c399ca5d4e4ce9ee9c40faddfec9b3fcca2fad2cd91ca00eee95c4a108273496c9e63db8017695ecf42d294d SHA512 f71c8ab8423e82ceae160bae8c17ac1222c1b2dde2ccb1b2aedb2288e0eb60485f8e9f3908640d4f6cebf166a148f4ad64026c035381c5db5141bf3059349d75
 DIST fio-3.16.tar.bz2 881436 BLAKE2B fee99930d0245474eb67ceee2d1a6ec2f1a0eb4da6d52cf8616d7eda64699a8c2727715284134fd4931e91efad69b064f66a80a78f70ea03e66d4eab4e601120 SHA512 2d651b20cbc6c7babf3adc082dbe78e1f7de920764653cf5ffd99df7516cf6190ffefe2152d2739326d3102949d9bad7db978ff88866cfa54020f9ec3b0a2a23
 DIST fio-3.17.tar.bz2 888795 BLAKE2B 10277efb1234708aff336fc3c0723d0b9b5c903dce3a999ea2b8749b5034c778be4828549b9e0d9fc36a4f9429ca86ac0011f0c110e1a44ed3ad33b6e4a30a68 SHA512 27dba4c3e8f544c0fd40a5f42660f64f42e114e7b56199bc70f540b1a09b9dec9291e3fbae0fab9691189fa4a1f40edbcf4f9b53c313fd9c1a8ba0fdbb7f524e
+DIST fio-3.19.tar.bz2 902391 BLAKE2B 84993717248add335a77c6fc03fa730f628806e1e001078d48a91bc5ac9703e42c6cc5c720cfe76a83d1daf4af2245bfd78fd6a871611de1c19562ca70a9cc89 SHA512 0004dbaf5a8ce4f2b13114a3bfb65c388bb6d01e9a82791208ff7e7eb54cd6741e60cc8cb0a19f6319301ee2040c03862725943972ea767e6cc65fce4a2b3ecb
 DIST fio-3.2.tar.bz2 613565 BLAKE2B e721d698338dd8d2c6215780a2d9a10c643a5912d3c27b3e759b4c14585ae1afe4edab5bdc54df8cf19c6f3727f8f4b19ce9da3298a5f0ef3753a5d8f423f4ef SHA512 97ea5ed6587d1e7382a67ab7ad933b6e332ba84cb648d17dcebad3c95c9eb6b1c04a4537e3470f890607f2921da77fcd4e49079b8b78f2d15e9c199dab850d1e
 DIST fio-3.7.tar.bz2 629354 BLAKE2B 99a1c88481c7a693e31b1a0bc23bc80e85df92385f9d5a7de8d6479be8bc425326a20d794eb4809f822adfcd06e07c66ebed321faa9dbae7a2c1d3c766a6467d SHA512 b1f5cb35fe1c06e030c570959ab9a96d936f9eaa2f7f30d5a34f34fd93fae057da07c4084a06143cd5188ad6b2cc06b564484f8867e050cfeddc0ee3fb0fe266
-EBUILD fio-2.15.ebuild 2693 BLAKE2B 302c54d0b33a6b4a14e1a19ff8cb1848438d87a2732860bfe947f50105eff2a59abb457cb2aefa5cac302a81c0146c3f6858ed91caceaeb54da44864e2c49b60 SHA512 5052d1f15e6250f0802a6a9786aef3ea95fa61a54cb1c7a58c29e80a8b79ed3170096b51fe20f3e8cf4b7ba264fcc4beb25a8e32f222ef7619af6324d73b7a91
+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 3903 BLAKE2B cee1dd4ea89f2f00d7fb627a5fabcb748deb70a15f998784ee3633977ee1e2aa614ce77d3665ba9813e229591af3eaa06bd1220dbd2f4c3992b0cde7910ceebd SHA512 4000258622da411512e41598e769768f54e59093e0dc8d5db1e894be90c10ddb2ed94f9ad2f569bef432ccee546d0a6a40e6c309cb0bf144c082e3346220ddc0
 EBUILD fio-3.2.ebuild 2855 BLAKE2B 9496bc95ff5ad4511285897285904b352e8e5e1ba547f8eed4932bece1b98f229c7677405c3f6af7e6948ab710e13d79612b94d9442f8371f63cd2a15003b9c6 SHA512 72db1a54e4e876142a7e4c1b16fa467fc0024a1d67eda20a77c97a9685833a03d5a0acaa54b07e0e62e3e12ebd128d2e49ccd58e36758f70c62ca9df25d09bd1
 EBUILD fio-3.7.ebuild 3006 BLAKE2B 0803b0f384761f77702d0e844767152c2f23f76291a3685bc2364d2a7dd2b781ea2170ec0da781ed4017c4821953b6d7a5ff7abfd1beac65687de2487a240724 SHA512 bc261cda042724608ec4e89e5b16bd96799d3ca72e87e19d32f3d95e30f6ca36f7d5e1ece54a125aaea7ddad49a59ae96b7ef52e5177fd158b5f934a15590b91
 MISC metadata.xml 1000 BLAKE2B b31d96139431d807a30a3d310a259aee985e0bcbc8bd8a0ca55951aa9fd7d11441e837a2fce8f92c8f53601bcdebc64b432d93bab2ff976e6a1d19726e91a853 SHA512 d2c849aae5d4c80bce349d6f34de456602cbb04a0c670e60a126a7ff2e77b0e48b66d08aecfe0ad9f75b10a580a8f2e9214a0864310abff066d6d06077ba6613
diff --git a/sys-block/fio/fio-2.15.ebuild b/sys-block/fio/fio-2.15.ebuild
index a599db324b68..f10632dd4d70 100644
--- a/sys-block/fio/fio-2.15.ebuild
+++ b/sys-block/fio/fio-2.15.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://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 glusterfs gnuplot gtk numa rbd rdma static zlib"
 REQUIRED_USE="gnuplot? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/sys-block/fio/fio-3.19.ebuild b/sys-block/fio/fio-3.19.ebuild
new file mode 100644
index 000000000000..bc57b7b265c8
--- /dev/null
+++ b/sys-block/fio/fio-3.19.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python2_7 python3_6 )
+
+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 numa python rbd rdma static tcmalloc zlib"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
+	libressl? ( curl )
+	gnuplot? ( python )"
+
+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(+)] )
+	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(+)] )
+	zlib? ( sys-libs/zlib[static-libs(+)] )"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+	gtk? ( x11-libs/gtk+:2 )"
+DEPEND="${RDEPEND}
+	static? ( ${LIB_DEPEND} )"
+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
+)
+
+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 "" "-lz" "zlib" *; *then/  '"s::if $(usex zlib true false) ; then:" \
+		-e '/if compile_prog "" "-laio" "libaio" ; then/'"s::if $(usex aio true false) ; then:" \
+		configure || die
+}
+
+src_configure() {
+	chmod g-w "${T}"
+	# not a real configure script
+	# TODO: pmem
+	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 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/open-iscsi/Manifest b/sys-block/open-iscsi/Manifest
index ba16182713ef..a8e21c967a4d 100644
--- a/sys-block/open-iscsi/Manifest
+++ b/sys-block/open-iscsi/Manifest
@@ -10,16 +10,14 @@ 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.0.877-optional_systemd.patch 2308 BLAKE2B 32ad0dd559cae999e5fa1cd2164a825bc7c17bfea07d8ab3ffc9bd469d14538b4ec469f241daed9dfcc376a11dd29dc15d0e14bc2b3d59667719b13e27571ffb SHA512 ed00b9155f623ccc6f871247f0388d7f453997b8ce5c04aba38eab36d5379c6e94896e3a0d6b16fe9ed52b96694ddb9b5e07b8bb9051940b4f4274a89ffb7c1c
-AUX open-iscsi-2.0.877-pkgconfig.patch 2882 BLAKE2B f763ae55aa0bc9e7d2f525a069bd7b35cc8f71fa51c5251ef1ca917373cf963f3ad26418bd72f68cadaa1678f86c9f246070a4ae03fc21fa49b52428a30b6290 SHA512 0da14100fa93fd256d6f6cbe4126be1f2fb874d3570fcdc09e8cb77052cc98413d8bde2bcaca6b7bc286b2494f8cca7c707813ecd4f290cc63cc8aa2ea8347af
 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.877.tar.gz 605075 BLAKE2B 85106a7137b2a70a56418e2c76df81d5bf464268b5030fef2560addd8a96a0b6ba767c811f7c8a181a7b30a902d3973f0f7dad7cd3cc0796979a8a1b2f9164ef SHA512 1e6a6772c59dd7a809938f1ef4c9fe0310d70bf0e0f7e80643bcfa22236af8a8027122cf9ff598ce70a3ff51ccb9d5ef99fc5b9c517379bf590b8da74bfeb9a6
 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
 EBUILD open-iscsi-2.0.873-r1.ebuild 2545 BLAKE2B c6b89937392718933e75616429acab05e7be548457b9aadaa1be77863dc8ed66e3acbaf482a320479b9c7f73507425615af86839209e2e956e08a12061097a41 SHA512 11de4116925ebe35a63ee19bb49a87bccff3c2648f3ea94ea05726d48cb0fe950a3aae9420b697c51f9f1387cea9075dfbffbeae7ca20af1e411769c34610339
-EBUILD open-iscsi-2.0.875.ebuild 3713 BLAKE2B b3ec80066fd3c7bf72e56361e59213ba8b8a4d57e777394e5842458620a712c14ad93cc1b69f47f266360570cc6c63be94582ea3f460730ef920320a5635c397 SHA512 8af21fe4129b7af58f2e126bb5c6f8e7f6b764246686dd2a7c80e13ea90f691bcb6722a8a4a6d688d096fa7d414fd52c0a214d7c1212d40495bbbddd241b7132
-EBUILD open-iscsi-2.0.877.ebuild 4038 BLAKE2B e9b029d7ce68a087b74dd898fb16131081f9258151b7b066dd56ca7d4be7d44a3f6087e98174b9fb0682a9b9efff1e3d6ecf553c2465f812398b9f61b7e98843 SHA512 75c8dc09217e30f3bc7a2ed99b8102b4244587baee647edc6583bcabce63d4a5a85447fe09e87a215746e66b265ca3c24c589f5ba08b96f786f708b992d2b50a
+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
 MISC metadata.xml 458 BLAKE2B 34a2a9b03797454b48ace319f383d85da5f9fe0f14afa1f1da1dc9afc535a2e1aeddaea0df27811b77fd3099b5754ee0755d49491157ed1e141fc2078c258389 SHA512 bd5e104acd3e07b8965b4eacb7b397b75448fc31b7359f17ee4e24af18fcd00ecd0c64001d42b7a542790151678b9dd02bad9513a69986c60cf91cceebfe86c3
diff --git a/sys-block/open-iscsi/files/open-iscsi-2.0.877-optional_systemd.patch b/sys-block/open-iscsi/files/open-iscsi-2.0.877-optional_systemd.patch
deleted file mode 100644
index b1f1a8f1d078..000000000000
--- a/sys-block/open-iscsi/files/open-iscsi-2.0.877-optional_systemd.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From f66608aa9ce989c91f744bb2f3f34d2e01aedc87 Mon Sep 17 00:00:00 2001
-From: Lee Duncan <lduncan@suse.com>
-Date: Tue, 14 May 2019 13:11:34 -0700
-Subject: [PATCH] Make iscsid systemd usage optional
-
-You can compile without system now by using something
-like:
-
-	make OPTFLAGS="-DNO_SYSTEMD ..." NO_SYSTEMD=1
-
-This will skip systemd code for iscsid and iscsiuio.
----
- Makefile     | 5 +++++
- usr/Makefile | 2 ++
- usr/iscsid.c | 6 ++++++
- 3 files changed, 13 insertions(+)
-
-diff --git a/Makefile b/Makefile
-index c941740c..9a337741 100644
---- a/Makefile
-+++ b/Makefile
-@@ -40,6 +40,11 @@ ifneq (,$(CFLAGS))
- export CFLAGS
- endif
- 
-+# export systemd disablement if set
-+ifneq ($(NO_SYSTEMD),)
-+export NO_SYSTEMD
-+endif
-+
- # Random comments:
- # using '$(MAKE)' instead of just 'make' allows make to run in parallel
- # over multiple makefile.
-diff --git a/usr/Makefile b/usr/Makefile
-index f1c35aa7..0203127c 100644
---- a/usr/Makefile
-+++ b/usr/Makefile
-@@ -41,7 +41,9 @@ CFLAGS += $(WARNFLAGS) -I../include -I. -D_GNU_SOURCE \
- CFLAGS += $(shell $(PKG_CONFIG) --cflags libkmod)
- ISCSI_LIB = -L$(TOPDIR)/libopeniscsiusr -lopeniscsiusr
- LDFLAGS += $(shell $(PKG_CONFIG) --libs libkmod)
-+ifeq ($(NO_SYSTEMD),)
- LDFLAGS += $(shell $(PKG_CONFIG) --libs libsystemd)
-+endif
- PROGRAMS = iscsid iscsiadm iscsistart
- 
- # libc compat files
-diff --git a/usr/iscsid.c b/usr/iscsid.c
-index 0c984409..37c13b39 100644
---- a/usr/iscsid.c
-+++ b/usr/iscsid.c
-@@ -34,7 +34,9 @@
- #include <sys/wait.h>
- #include <sys/types.h>
- #include <sys/stat.h>
-+#ifndef	NO_SYSTEMD
- #include <systemd/sd-daemon.h>
-+#endif
- 
- #include "iscsid.h"
- #include "mgmt_ipc.h"
-@@ -339,6 +341,7 @@ static void missing_iname_warn(char *initiatorname_file)
- /* called right before we enter the event loop */
- static void set_state_to_ready(void)
- {
-+#ifndef	NO_SYSTEMD
- 	if (sessions_to_recover)
- 		sd_notify(0, "READY=1\n"
- 				"RELOADING=1\n"
-@@ -346,14 +349,17 @@ static void set_state_to_ready(void)
- 	else
- 		sd_notify(0, "READY=1\n"
- 				"STATUS=Ready to process requests\n");
-+#endif
- }
- 
- /* called when recovery process has been reaped */
- static void set_state_done_reloading(void)
- {
-+#ifndef	NO_SYSTEMD
- 	sessions_to_recover = 0;
- 	sd_notifyf(0, "READY=1\n"
- 			"STATUS=Ready to process requests\n");
-+#endif
- }
- 
- int main(int argc, char *argv[])
diff --git a/sys-block/open-iscsi/files/open-iscsi-2.0.877-pkgconfig.patch b/sys-block/open-iscsi/files/open-iscsi-2.0.877-pkgconfig.patch
deleted file mode 100644
index 1756196e6b33..000000000000
--- a/sys-block/open-iscsi/files/open-iscsi-2.0.877-pkgconfig.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From 623a81123c494f5c69dc6616bd72e838862e2f1f Mon Sep 17 00:00:00 2001
-From: Lee Duncan <lduncan@suse.com>
-Date: Mon, 12 Nov 2018 13:10:04 -0800
-Subject: [PATCH] Use pkg-config in Makefiles for newer libraries.
-
-These two recently-added libraries can be in different
-locations on different distros, so use pkg-config to
-added the appropriate actions in the make files.
----
- libopeniscsiusr/Makefile |  8 +++++++-
- usr/Makefile             | 11 ++++++++---
- 2 files changed, 15 insertions(+), 4 deletions(-)
-
-diff --git a/libopeniscsiusr/Makefile b/libopeniscsiusr/Makefile
-index bf7c96c7..a045a459 100644
---- a/libopeniscsiusr/Makefile
-+++ b/libopeniscsiusr/Makefile
-@@ -23,6 +23,8 @@ endif
- INCLUDE_DIR ?= $(prefix)/include
- PKGCONF_DIR ?= $(LIB_DIR)/pkgconfig
- 
-+PKG_CONFIG = /usr/bin/pkg-config
-+
- LIBISCSI_USR_DIR=$(TOPDIR)/libopeniscsiusr
- 
- LIBISCSI_USR_VERSION_MAJOR=0
-@@ -43,13 +45,17 @@ 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 += $(shell $(PKG_CONFIG) --cflags libkmod)
-+
-+LDFLAGS += $(shell $(PKG_CONFIG) --libs libkmod)
- 
- LIBADD =
- 
- all: $(LIBS) $(LIBS_MAJOR) $(TESTS) doc
- 
- $(LIBS): $(OBJS)
--	$(CC) $(CFLAGS) $(LDFLAGS) -shared -Wl,-soname=$@ -o $@ $(OBJS) $(LIBADD)
-+	@echo CFLAGS= $(CFLAGS)
-+	$(CC) $(CFLAGS) -shared -Wl,-soname=$@ -o $@ $(OBJS) $(LDFLAGS) $(LIBADD)
- 	ln -sf $@ $(DEVLIB)
- 
- $(LIBS_MAJOR): $(LIBS)
-diff --git a/usr/Makefile b/usr/Makefile
-index f9445ada..f1c35aa7 100644
---- a/usr/Makefile
-+++ b/usr/Makefile
-@@ -32,11 +32,16 @@ IPC_OBJ=ioctl.o
- endif
- endif
- 
-+PKG_CONFIG = /usr/bin/pkg-config
-+
- CFLAGS ?= -O2 -g
- WARNFLAGS ?= -Wall -Wstrict-prototypes
- CFLAGS += $(WARNFLAGS) -I../include -I. -D_GNU_SOURCE \
- 	  -I$(TOPDIR)/libopeniscsiusr
-+CFLAGS += $(shell $(PKG_CONFIG) --cflags libkmod)
- ISCSI_LIB = -L$(TOPDIR)/libopeniscsiusr -lopeniscsiusr
-+LDFLAGS += $(shell $(PKG_CONFIG) --libs libkmod)
-+LDFLAGS += $(shell $(PKG_CONFIG) --libs libsystemd)
- PROGRAMS = iscsid iscsiadm iscsistart
- 
- # libc compat files
-@@ -60,14 +65,14 @@ all: $(PROGRAMS)
- 
- iscsid: $(ISCSI_LIB_SRCS) $(INITIATOR_SRCS) $(DISCOVERY_SRCS) \
- 	iscsid.o session_mgmt.o discoveryd.o mntcheck.o
--	$(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@  -lisns -lcrypto -lrt -lmount $(ISCSI_LIB)
-+	$(CC) $(CFLAGS) $^ -o $@  -lisns -lcrypto -lrt -lmount $(LDFLAGS) $(ISCSI_LIB)
- 
- iscsiadm: $(ISCSI_LIB_SRCS) $(DISCOVERY_SRCS) iscsiadm.o session_mgmt.o mntcheck.o
--	$(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ -lisns -lcrypto -lmount $(ISCSI_LIB)
-+	$(CC) $(CFLAGS) $^ -o $@ -lisns -lcrypto -lmount $(LDFLAGS) $(ISCSI_LIB)
- 
- iscsistart: $(ISCSI_LIB_SRCS) $(INITIATOR_SRCS) $(FW_BOOT_SRCS) \
- 		iscsistart.o statics.o
--	$(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ -lrt $(ISCSI_LIB)
-+	$(CC) $(CFLAGS) $^ -o $@ -lrt $(LDFLAGS) $(ISCSI_LIB)
- clean:
- 	rm -f *.o $(PROGRAMS) .depend $(LIBSYS)
- 
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 3ee56434ec49..dcb2eadf66ab 100644
--- a/sys-block/open-iscsi/open-iscsi-2.0.875.ebuild
+++ b/sys-block/open-iscsi/open-iscsi-2.0.875.ebuild
@@ -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.0.877.ebuild b/sys-block/open-iscsi/open-iscsi-2.1.1.ebuild
index 3c166cfb0a40..43f3ee2b89ff 100644
--- a/sys-block/open-iscsi/open-iscsi-2.0.877.ebuild
+++ b/sys-block/open-iscsi/open-iscsi-2.1.1.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
@@ -32,8 +32,6 @@ REQUIRED_USE="infiniband? ( rdma ) || ( rdma tcp )"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-2.0.876-Makefiles.patch"
-	"${FILESDIR}/${PN}-2.0.877-pkgconfig.patch"
-	"${FILESDIR}/${PN}-2.0.877-optional_systemd.patch"
 )
 
 pkg_setup() {
@@ -107,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
@@ -115,9 +113,15 @@ src_install() {
 	newconfd "${FILESDIR}"/iscsid-conf.d iscsid
 	newinitd "${FILESDIR}"/iscsid-init.d iscsid
 
-	systemd_dounit etc/systemd/iscsi.service
-	systemd_dounit etc/systemd/iscsid.service
-	systemd_dounit etc/systemd/iscsid.socket
+	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
@@ -126,7 +130,7 @@ src_install() {
 
 pkg_postinst() {
 	in='/etc/iscsi/initiatorname.iscsi'
-	if [ ! -f "${EROOT}${in}" -a -f "${EROOT}${in}.example" ]; then
+	if [[ ! -f "${EROOT}${in}" ]] && [[ -f "${EROOT}${in}.example" ]] ; then
 		{
 		  cat "${EROOT}${in}.example"
 		  echo "# InitiatorName generated by ${CATEGORY}/${PF} at $(date -uR)"
diff --git a/sys-block/open-isns/Manifest b/sys-block/open-isns/Manifest
index 10c963fc0def..f13b4fda399b 100644
--- a/sys-block/open-isns/Manifest
+++ b/sys-block/open-isns/Manifest
@@ -1,10 +1,9 @@
-AUX open-isns-0.97-musl.patch 268 BLAKE2B f8532ce884afc0ee837bf2f56115d46bb1ed00fef02baa7ec9819579cff791c839efec6ad35588cfeea022b0c822e936d5c7a1cf89a14cbce096c2e1deda2274 SHA512 c75c031e04281dbc9bcb9c9db66e274346ff3d7b5c38faa64e7271943db842a740019b2fb61d0ed0b1850fb78c678d67dd864f3c77a7554efc03bcba5e7250a1
-AUX open-isns-0.97-ossl-1.1.patch 1133 BLAKE2B 0649413cd3a9f8684a0c7a2982d4afdeb3369a3e06d20581e3be3821cd3d435bd9dfba5adc14e573d00041d0c7f4cbd51ee384fc211d3c87ed7b31df44465e00 SHA512 334ed03ecd2876e31f8824ad5ff004732c31211a863244d5d5439e6f6b06b85e92b43d9026379e6b151d123f8b19e6054716776c9e9cb285f3fd51fd9dd150e6
+AUX open-isns-0.100-no_Werror.patch 1235 BLAKE2B 4ecc08979a1cd1bacc46608b98419fbc5ef6bb571dc55682e1dd39ac1434bdf6e7972fc6ebd42dd4256e1be929a28a0b5ab76fd66131ff72e8962c2b2a61e1f7 SHA512 4831f745b3c2853f2eb57bc3df84261853d6e20b82c05902a3dc295f234aa81d2e075f18041cbe894d7f855d0d8f8d62c188dd7a19809a7ed48bef091bbc68f1
 AUX open-isns-0.98-libressl-compatibility.patch 463 BLAKE2B ed542e70bbd96b78b2e339dd7eced0b4edf87af62b189fc02ae431946161bb6385ffd2f8d6cf0f60edcc2092e9b57e2272e7e2fa4da0eb8f80c2a19f7d02e75e SHA512 dfce1df2699e24085f4c88340d5fb7e3f878d182608301c79b0f5736b0e29f3c79b0d37650d925cc06d429b59e9697b634ab1d16706fabbdf4b443bdcf4c9bc3
-DIST open-isns-0.97.tar.gz 278317 BLAKE2B 7083b3ebef78a5afb35e8cc31e86674b407eb48224139745142238f559e95ceca8755e570031559bdf29ec691947693303e07b8f81b915a3b7f2396329bbd2b3 SHA512 78c934162d5a1d093bccd49449d4ef369b896d34309d76b4963d643a699640617c4fe064388c481c35b9be26e012f19713f3aad378af9ad88fa94c3d300e919d
+DIST open-isns-0.100.tar.gz 300611 BLAKE2B a40e8d2bd6e5ac8ed8475d3d50ed6256871134547a044a6b51102ad47c66c335f06372b29e5585df4e59ecd7a817e5f2e48c5e944eea31333ab9f45d51040306 SHA512 ccf49ba1c60d46ae49b75424a966abc1f7e104c8ffa13013951a58a8f0ccaa1cf550f24fd2743fcaba1211a0ec8033c5df5249b7a108ae5974d4f1144dd3b169
 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.97.ebuild 891 BLAKE2B 4fc42c97068e57edc634ea5bcf40f561834d4d56d49f5c7b061cdf1a904271c169b0a63334f1c10d722b1a25a4b160a7b4e8be5c9a3c4224757709f4e4c7fad3 SHA512 098c8d16bbafa1168cf1f233fdfd787b47103b103a065939fb41e447a309f7943e54dde6b45c6569c2cf19508167df4b84c40c0b8f4edbb3bd622cc495c6d0cb
-EBUILD open-isns-0.98.ebuild 932 BLAKE2B 3c3f0899b893697b850b1087b811faf8b1e8806c68a53a7f3d4736afd019eeee6e41caebc0ec9ebc0097a74507720e2cd9859cb0cae1917493f3257752cf6100 SHA512 ee768bb3d6232627d507ae796f34ae466eff4662e1c29b5dfe7f9531dff67aa9d4681ff1041e141d583ecd875abdcda1b9217b2e58bbb729180e1603a826eb64
+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.99.ebuild 1092 BLAKE2B 1e0ce4502ab428063bae59b56a2f6df6353fcbaf839e37c4fb5a6602be2e70c3f41bc8a8fbd98c680a84a70452fd46043b3f90a2e9e6d650fb8beff287ca6e70 SHA512 56a48b518e7d8316cc77c92cf8160fe792920a781f4e0f30f861e3803a0e228f913f579eaeb92d41df38d94af966687d72e12dc84fcec9892c227d64f236f914
 MISC metadata.xml 342 BLAKE2B 428bf589c8161595c69d65533c0df938c71d69fa6d56b1e4ac2a14bf528d5b93645fc667d3f8b698d4e28ca874c1ffbffb7d4daef712ffc79f5e10e542bf53e7 SHA512 a056b81c2e162e8b13a54f463476fea5f203b9929aeef07629b600d8f11eda26fe0402aec5e56a411e544b39d6c38a5766f773d4a699c72680f11f8dffc4bced
diff --git a/sys-block/open-isns/files/open-isns-0.100-no_Werror.patch b/sys-block/open-isns/files/open-isns-0.100-no_Werror.patch
new file mode 100644
index 000000000000..2d966dd3a4fd
--- /dev/null
+++ b/sys-block/open-isns/files/open-isns-0.100-no_Werror.patch
@@ -0,0 +1,41 @@
+From 40eb9ce75518817762a0eac4a93016ab817add89 Mon Sep 17 00:00:00 2001
+From: Lee Duncan <lduncan@suse.com>
+Date: Sat, 1 Feb 2020 10:23:04 -0800
+Subject: [PATCH] Fix 586 compile issue and remove -Werror
+
+Using -Werror causes any issue to break the build, whereas
+I'd rather let the build continue and address the issue.
+
+Also, fixed one signed-vs-unsigned compare for time_t, which
+shows up only on 586 (32-bit).
+---
+ configure.ac | 2 +-
+ isnsdd.c     | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index e4f3995..d956e58 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -17,7 +17,7 @@ AC_PATH_PROG(SH, sh)
+ dnl C Compiler features
+ AC_C_INLINE
+ if test "$GCC" = "yes"; then
+-        CFLAGS="-Wall -Werror -Wextra $CFLAGS"
++        CFLAGS="-Wall -Wextra $CFLAGS"
+ 	CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
+ fi
+ 
+diff --git a/isnsdd.c b/isnsdd.c
+index 58825cc..9cedb9f 100644
+--- a/isnsdd.c
++++ b/isnsdd.c
+@@ -401,7 +401,7 @@ check_portal_registration(__attribute__((unused))void *ptr)
+ 			continue;
+ 
+ 		last_modified = isns_object_last_modified(obj);
+-		if (last_modified + 2 * interval > now) {
++		if ((time_t)(last_modified + 2 * interval) > now) {
+ 			good_portals++;
+ 			continue;
+ 		}
diff --git a/sys-block/open-isns/files/open-isns-0.97-musl.patch b/sys-block/open-isns/files/open-isns-0.97-musl.patch
deleted file mode 100644
index 098ade40a213..000000000000
--- a/sys-block/open-isns/files/open-isns-0.97-musl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./include/libisns/util.h.orig
-+++ ./include/libisns/util.h
-@@ -114,6 +114,6 @@
- #   define ntohll(x)	__bswap_64(x)
- #  endif
- # else
--#  include <sys/endian.h>
-+#  include <endian.h>
- #  define htonll(x)     htobe64(x)
- #  define ntohll(x)     be64toh(x)
- # endif
diff --git a/sys-block/open-isns/files/open-isns-0.97-ossl-1.1.patch b/sys-block/open-isns/files/open-isns-0.97-ossl-1.1.patch
deleted file mode 100644
index ebb641af27d4..000000000000
--- a/sys-block/open-isns/files/open-isns-0.97-ossl-1.1.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 70b11a0f9c4056dc6891c2d5550c28993905f18a Mon Sep 17 00:00:00 2001
-From: eroen <open-isns@occam.eroen.eu>
-Date: Mon, 2 Jan 2017 23:15:08 +0100
-Subject: [PATCH] Disable deprecated initializations for openssl-1.1.0
-
-This fixes several undefined reference errors when linking with
-openssl-1.1.0c.
-
-X-Gentoo-Bug: 604454
-X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=604454
----
- pki.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/pki.c b/pki.c
-index f69ddca..5fdf9f2 100644
---- a/pki.c
-+++ b/pki.c
-@@ -67,7 +67,9 @@ void BN_GENCB_free(BN_GENCB *cb)
- #endif
- 
- 
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- static int	isns_openssl_init = 0;
-+#endif
- 
- static int	isns_dsasig_verify(isns_security_t *ctx,
- 				isns_principal_t *peer,
-@@ -92,6 +94,7 @@ isns_create_dsa_context(void)
- {
- 	isns_security_t	*ctx;
- 
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- 	if (!isns_openssl_init) {
- 		ERR_load_crypto_strings();
- 		OpenSSL_add_all_algorithms();
-@@ -99,6 +102,7 @@ isns_create_dsa_context(void)
- 		OpenSSL_add_all_digests();
- 		isns_openssl_init = 1;
- 	}
-+#endif
- 
- 	ctx = isns_calloc(1, sizeof(*ctx));
- 
--- 
-2.11.0
-
diff --git a/sys-block/open-isns/open-isns-0.97.ebuild b/sys-block/open-isns/open-isns-0.100.ebuild
index 098784ba743c..878669c9073a 100644
--- a/sys-block/open-isns/open-isns-0.97.ebuild
+++ b/sys-block/open-isns/open-isns-0.100.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit flag-o-matic
+inherit autotools flag-o-matic
 
 DESCRIPTION="iSNS server and client for Linux"
 HOMEPAGE="https://github.com/open-iscsi/open-isns"
@@ -12,28 +12,45 @@ 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"
-IUSE="debug slp ssl static"
+IUSE="debug libressl ssl static"
 
 DEPEND="
-	ssl? ( dev-libs/openssl:= )
-	slp? ( net-libs/openslp )"
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+"
 RDEPEND="${DEPEND}"
 
 PATCHES=(
-	"${FILESDIR}/${P}-musl.patch"
-	"${FILESDIR}/${P}-ossl-1.1.patch"
+	"${FILESDIR}/${PN}-0.98-libressl-compatibility.patch"
+
+	# Upstream patches (can usually be removed with next version bump)
+	"${FILESDIR}"/${P}-no_Werror.patch
 )
 
+src_prepare() {
+	default
+	eautoreconf
+}
+
 src_configure() {
 	use debug && append-cppflags -DDEBUG_TCP -DDEBUG_SCSI
 	append-lfs-flags
-	econf $(use_with slp) \
-		$(use_with ssl security) \
+	local myeconfargs=(
+		--without-slp
+		$(use_with ssl security)
 		$(use_enable !static shared)
+	)
+	econf "${myeconfargs[@]}"
 }
 
 src_install() {
 	default
 	emake DESTDIR="${D}" install_hdrs
 	emake DESTDIR="${D}" install_lib
+	keepdir /var/lib/${PN/open-}
+	if ! use static ; then
+		find "${ED}" -type f -name "*.a" -delete || die
+	fi
 }
diff --git a/sys-block/open-isns/open-isns-0.98.ebuild b/sys-block/open-isns/open-isns-0.98.ebuild
index 3b96e86c226d..98810887454e 100644
--- a/sys-block/open-isns/open-isns-0.98.ebuild
+++ b/sys-block/open-isns/open-isns-0.98.ebuild
@@ -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/parted/Manifest b/sys-block/parted/Manifest
index 83009faa6572..60046065dd2c 100644
--- a/sys-block/parted/Manifest
+++ b/sys-block/parted/Manifest
@@ -7,9 +7,9 @@ DIST parted-3.2.tar.xz 1655244 BLAKE2B 56608590b26a9b5266dacf3698d990b730bdb35d9
 DIST parted-3.3.tar.xz 1757432 BLAKE2B d1e248cd8fdce22d4957055d65f9f93333505229f92174f343897422a31a43f3d35ea06f8f1bdafd254e4629c5890ec38d6b75d3b499c39a9ada4a8d5f9d9d8f SHA512 d1384694a491aa53bab6206fdeccd1d192de2ed379fe25aa865dd6aa06ed945a728e85b2ccc2fb23f5aa9dfee4a8bd8f0f2be1dd386cb8e8861b73382c6a07e4
 DIST parted_3.2-23.debian.tar.xz 88152 BLAKE2B 5e69a5799cc909bf54d1dcd1c7a8f7fe5dd7ce46b03957406f4a6118480d5acca3a165cc16b720fd03a89339fcfb46844d470079c4e10a4683e270c9e804c245 SHA512 7f449a24d1ea75a185b5fd589fea73a2f0944f1276288ece2790c5889de6adf8354f94388046a25b2dbf5735759f6010397f140607320a4de348cf77f8c75b09
 DIST parted_3.2-25.debian.tar.xz 88524 BLAKE2B e994ca8a68f700773e0a67657d59793ea130a5c7e9eca31688fa48e7133a0c350446b8c0a175ac2f59aca8c2fe1ef419a94f3f6f0547b0b25cca329c6f569571 SHA512 2d4e52513b016ef67b203db577641cd56b4d2d013e1bc186b665ab47d0f6c673321b108f81d36caaa0fd14c555d8336a2556a60cccbeccb9d2cf98a85872d949
-EBUILD parted-3.2-r1.ebuild 1482 BLAKE2B b9405446b286e8a3b5e434e3621baf8f219a1048b9907ac3a7d18ffa9e60a1a73986a6043810eb981a03fb2ae695547555f0d9f3945eeb620bdc96d36dcd4c84 SHA512 b8ccaf37faab18ce4c7370ac96b049e674869427fef36a3d5d4eb603c267f376b5f9063022d020897398874b73a6ec695b1a31705274e8bb315352131a0d90ee
-EBUILD parted-3.2_p23.ebuild 1681 BLAKE2B c8e692eeb175b4d7fcdecd56a3226e62437e513a949acaa22f5f7abd0e80ef62e2e256cb8079d099e6ca703789eea632a542cda07204bd9925f82b3609d06fe0 SHA512 887e79c265e4ee4aae6b12a6de4490929aa994e136f3f2efedec390cb7bd3b08c2f90358dd0f6a770ae1c388056af512b40a4abdb0f6d8dc7f922b750405f812
-EBUILD parted-3.2_p25.ebuild 1682 BLAKE2B 8b97f2feb20e3852ed9068a36a7ef9e5f4f495ace0121719672831f9082124c10f8ed9de97e14d72d109fecf1646f17f3259f72a76091f807fc51edeba686930 SHA512 b5375d2a3268897942d74f38b900e0d97bc64288ebf9f971d44fcee33f2e9d62c6023b172cf312068181ad89a97a88692450261b176075f8eb550b7b792557b8
-EBUILD parted-3.3-r1.ebuild 1396 BLAKE2B 2addacbc25bdb3f4025ea3cb46db8123d3dc6a9ce082c5fe6850a7a41a381f2747bccba05d0df170bf0378c3a60fea497f1de8a3076a1bc537d2dab6359ba106 SHA512 3698834b9d6fe25901a932a385f9c24a394ec5952c70b52abf656b34f599fc8343178e232ced030fb39b6ed75d86e89ab73a281037fa2c8bef19aef279808faa
+EBUILD parted-3.2-r1.ebuild 1479 BLAKE2B 72706d8d8cfbc63af64546de63d6e8b9baeea99e6ac032f8565a09a2ecb21cba9c2cb946a87b322df7274acc0a021609e4ac0260694c1313c3ca0a85a7f37b2d SHA512 39ad4d18564b6bd06978e33087d756654962eec60ca945e99690762f2c44e80ae580ee33c74a3bee3c0ecd4a362ae6b5083422cbe9c8eae431792620b7e38456
+EBUILD parted-3.2_p23.ebuild 1677 BLAKE2B a5d9dc1c9873434259b6e4625dd5399f7cb190d2adaa66fccc8e1088523769b7fac5d6d41e74ec8e1921a3d41202007811335d5df206d287f13df52b8ccb76b4 SHA512 69f4d97ba8583b658261cb47af1db6993a065c17c54d444acdbab67020efd3fff85ca301d0aa49fb36a3f43352068306f2dd5532eb569f247548897c24585160
+EBUILD parted-3.2_p25.ebuild 1678 BLAKE2B 01aec7444da95f070d776ba0fdccb825391abdbcf2ea488cf72836e8b6c057d325c31b45657a5de166bc47b12bc46b008ee2bed623748f6d6663f303b5d6c0e7 SHA512 e9489c3cb304975a4bf2eb83d005b5c6230252278e48a24fcbb1c97d95252c73b92e288613c1b353c94ae02496e65f68030241f2980ce3f1d5426e45334609ec
+EBUILD parted-3.3-r1.ebuild 1392 BLAKE2B 7fd4582f48518e8cc48d82e3d7b21c626d18aacd6fe469cd201d827e90af5e517a81881ec13db20dd5afbff55b1e69c01c5c7e5fb45d3bdb93b1677041bb1e23 SHA512 e8b197e02351925ebe775cecc268303324ce2a28a11507ac42e47104987de8083ee6bf4122d01391629cdff5e4ba3b28c3babe225245bb0d8a1eee338268bdbb
 EBUILD parted-99999.ebuild 1407 BLAKE2B ac953dbc8d771ffab9d7e39990020a2ab01e621ded61b2b42a9bac6778eae29015dd4be1d2e02201adf15435cd7016bfd054bf42a21b756850f686ea41c5e061 SHA512 02c10b91a43ecbe806d7ec7bd546e212c98a8ba5ed93d5ad68dc0013886b3cdab34e13033776f88d71c813b7fa9710e20fa4568056651bd95df1267d56d61935
 MISC metadata.xml 754 BLAKE2B 6bf44d26295c82c00691f9ba11e114f43c2674e98b1a0f332280e2753c08aeeb5b5a402c2288e9f0c654d4d91be1ed20810eb4b19cf277b76d326423ee6b19a8 SHA512 b5ced0310e8a606de46a5a2a690d7a549c5528eb843616621486db93a9fc45266eafbcbacc90d38d8005cd0366fee671705fc98c54c79bf0b3519d182d15c184
diff --git a/sys-block/parted/parted-3.2-r1.ebuild b/sys-block/parted/parted-3.2-r1.ebuild
index e11c1718e0bb..5c7263071d8e 100644
--- a/sys-block/parted/parted-3.2-r1.ebuild
+++ b/sys-block/parted/parted-3.2-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="+debug device-mapper nls readline selinux static-libs"
 RESTRICT="test"
 
diff --git a/sys-block/parted/parted-3.2_p23.ebuild b/sys-block/parted/parted-3.2_p23.ebuild
index 23b6fd869b5c..c02bd5426f6d 100644
--- a/sys-block/parted/parted-3.2_p23.ebuild
+++ b/sys-block/parted/parted-3.2_p23.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="+debug device-mapper nls readline selinux static-libs"
 RESTRICT="test"
 
diff --git a/sys-block/parted/parted-3.2_p25.ebuild b/sys-block/parted/parted-3.2_p25.ebuild
index 4e4c2d823f4e..fceabd18435f 100644
--- a/sys-block/parted/parted-3.2_p25.ebuild
+++ b/sys-block/parted/parted-3.2_p25.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="+debug device-mapper nls readline selinux static-libs"
 RESTRICT="test"
 
diff --git a/sys-block/parted/parted-3.3-r1.ebuild b/sys-block/parted/parted-3.3-r1.ebuild
index aa26a6fbc5b9..20e7c295951b 100644
--- a/sys-block/parted/parted-3.3-r1.ebuild
+++ b/sys-block/parted/parted-3.3-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="+debug device-mapper nls readline selinux static-libs"
 RESTRICT="test"
 
diff --git a/sys-block/partitionmanager/Manifest b/sys-block/partitionmanager/Manifest
index 44791de419fb..b1079db1cd9c 100644
--- a/sys-block/partitionmanager/Manifest
+++ b/sys-block/partitionmanager/Manifest
@@ -1,5 +1,3 @@
-DIST partitionmanager-4.0.0.tar.xz 1327504 BLAKE2B a0ce0daf5a0ef922ca881562da25efd0118115df5e0a7d00ddb6ab994d7ea523cd67772bbaf562b6b33edd5ddc451fc49067d9c8992d734d4e2816c13cac6c45 SHA512 dbdae666b29996a7ef463159cd96469cf5081ca9027d1d59556e21556e2488485c0d4bee1e9005a446a47b13e3c1e4b71014f58c7bfa830adfd7c39364f4581a
 DIST partitionmanager-4.1.0.tar.xz 1347088 BLAKE2B 1095f4bd006177483dec455bdf6b18cb16b27b19d79ec10bde3d992a5dc3942c59f3a46d32abcbed3670a09acd6293f3f9c80041803ffaf9139c3a8b10b9a9ca SHA512 63f77c68f0468e6b17da33bf52824e2858b43f33cb46f8ff7069386d56a154c86f5f3ec20113c472d567a790ba0d8593c2ecb44d9c0d4e1614dcdc570b072761
-EBUILD partitionmanager-4.0.0.ebuild 1047 BLAKE2B 125d7abd832e11913802b95b450df5d10842ec78cea1feb17854f3bb4df133ea4410049e480b7d824f7f71a6f4ba3edb32301ff60b0e64810980b4f3c2d4a778 SHA512 4886b1ea761e28d0d5f789ab08c63fc067b77b08bea26d80647f1511c7cc1a883a08bf5ac36b883d5c14512deada00eb6a17c9e582d36f94a3c1dc915053013f
-EBUILD partitionmanager-4.1.0.ebuild 1057 BLAKE2B 8ba67b8ea2bc8c8aaeba4397e9e87a1f30abf033451082780bd4a07d56d0997acf4d4d8b837e180d22bd00fd6c019398077565a8b51a27d8f762618c6cba95aa SHA512 c0151f077467dafb77082f468c6b436bc8cd503e984c9ee6e0e63ecfb0c2087349aa0172643fa20eba20cff6914d7b22e994d8d431d51e32fab2f11bdc773c41
+EBUILD partitionmanager-4.1.0.ebuild 1055 BLAKE2B 3f90494eeef6fab917e326a56923b7c4af0ad37d38bb41aa680df7627ed07f4ac85880fb5170890e791574a394c59ce167422575c937122d4a1d03c8cddf0fd8 SHA512 27c6fc0993462e2f615fb78e144110b36a8398098431bf09119884f72f91dd527f68997a13cf6110a8e693722f66141cdddd5b6ba3fc669dce74e4627bc9289c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/sys-block/partitionmanager/partitionmanager-4.0.0.ebuild b/sys-block/partitionmanager/partitionmanager-4.0.0.ebuild
deleted file mode 100644
index 158d380ad8d2..000000000000
--- a/sys-block/partitionmanager/partitionmanager-4.0.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="optional"
-KFMIN=5.56.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Utility for management of disks, partitions and file systems"
-HOMEPAGE="https://kde.org/applications/system/org.kde.partitionmanager"
-
-if [[ ${KDE_BUILD_TYPE} == release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="5"
-
-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/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=sys-libs/kpmcore-3.3.0:5=
-"
-RDEPEND="${DEPEND}"
diff --git a/sys-block/partitionmanager/partitionmanager-4.1.0.ebuild b/sys-block/partitionmanager/partitionmanager-4.1.0.ebuild
index d025f1f4484f..c270f5aa9d22 100644
--- a/sys-block/partitionmanager/partitionmanager-4.1.0.ebuild
+++ b/sys-block/partitionmanager/partitionmanager-4.1.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://kde.org/applications/system/org.kde.partitionmanager"
 
 if [[ ${KDE_BUILD_TYPE} == release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 LICENSE="GPL-3"
diff --git a/sys-block/rts_pstor/Manifest b/sys-block/rts_pstor/Manifest
index febfd9a3b073..1d2eee95dc59 100644
--- a/sys-block/rts_pstor/Manifest
+++ b/sys-block/rts_pstor/Manifest
@@ -1,5 +1,6 @@
 AUX fix-compile-kernel-5.0.0.patch 716 BLAKE2B ecb1bbdaf80d7e801f6e316308f559f29b4f0a5a431dc74aea82fd771e4ba31945ed77b5041398c0bee144f7912e89c91b55f29158e866dbde3687c50425c1c0 SHA512 5eeb472b97ca4742358e6002afc3d7839b1d25d0e08e72badf0447b0d951b2950c195a9120288b377a45ea118af754b5418a7ff251b463df457a1c201cc5d107
+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 1388 BLAKE2B d4b8ed4a1a796283a275ebc152f5ab24423cf2739194853684f0797f355815003ed5b2a31b4c63c347fd8a41255dc866d15d8debd7f8d596c55c7126f7627a29 SHA512 7281a71816d36acf67f2a70275a49956b8f555c61eb411576caee572a3e7c18c5ab2da2d54cf0fd5fa27f55ed54b2373a282ef82e5a8a8f62c52f473dacfad6e
-MISC metadata.xml 433 BLAKE2B 68ad81664e636facb6f248effc7c3ef58ea0c3cc86cc306b0862113665a296bcffe4df996861367eb98e26589c6124282a75d193fe1b84e90cbce12819b9279f SHA512 ef139e88440c4ad838b50a762373588a832dd4230596034399cb1b2fbb246a1fe957c8af86d98d80918fa747f2a0abad960af8a5144acbcd808dc956a833515b
+EBUILD rts_pstor-1.10_p20160103.ebuild 1655 BLAKE2B bf8cf45663b501a08f6a7ef6d7eb4035fb516f56ac53ca1c7b4b8b9002bcb516735f377a31e8766d08c976618ae688b201cf083b80c43b1854b74936ec239d0f SHA512 fd57a275c389f35a327ae3de379dc1d52bc65c148c88f9321226cff015321953a8e1dec53d09e7733d02a73537d8d45ea6d086fa15eb05f25714956564e32294
+MISC metadata.xml 338 BLAKE2B 518a4272f88da61f60f7ec2269dda5108abc8346f08e497d2bc8fd7d65700cb0e5e0bebbfb3503e44dc033452045c335c1d2c5e52dd8222d9467b578dfb79b09 SHA512 8de518f5f270304254bd185f4057700a117d05d151a981a887835c9f1af77fcaeb4c4cee3a9779e20ca28500779b16b3c09c4bdc619dc4d39e114d6b698e2ebe
diff --git a/sys-block/rts_pstor/files/rts_pstor-makefile-kernel-5.1.patch b/sys-block/rts_pstor/files/rts_pstor-makefile-kernel-5.1.patch
new file mode 100644
index 000000000000..ff527e8a530a
--- /dev/null
+++ b/sys-block/rts_pstor/files/rts_pstor-makefile-kernel-5.1.patch
@@ -0,0 +1,7 @@
+--- a/Makefile
++++ b/Makefile
+@@ -36,3 +36,3 @@
+ 	cp -f ./define.release ./define.h
+-	make -C /lib/modules/$(shell uname -r)/build/ SUBDIRS=$(PWD) modules
++	+make -C $(KERNELDIR) M=$(PWD) modules
+ debug:
diff --git a/sys-block/rts_pstor/metadata.xml b/sys-block/rts_pstor/metadata.xml
index ab7993355b87..429074c44a31 100644
--- a/sys-block/rts_pstor/metadata.xml
+++ b/sys-block/rts_pstor/metadata.xml
@@ -8,7 +8,4 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
-	<longdescription lang="en">
-		PCI-E RTS5209 card reader driver for Linux.
-	</longdescription>
 </pkgmetadata>
diff --git a/sys-block/rts_pstor/rts_pstor-1.10_p20160103.ebuild b/sys-block/rts_pstor/rts_pstor-1.10_p20160103.ebuild
index e9b31fc3584d..aebf0d373c10 100644
--- a/sys-block/rts_pstor/rts_pstor-1.10_p20160103.ebuild
+++ b/sys-block/rts_pstor/rts_pstor-1.10_p20160103.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,10 +16,6 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 DEPEND="virtual/linux-sources"
-PATCHES=(
-	"${FILESDIR}/rts_pstor-makefile.patch"
-	"${FILESDIR}/fix-compile-kernel-5.0.0.patch"
-)
 S="${WORKDIR}/RTS5209-linux-driver-${GIT_COMMIT}"
 
 MODULE_NAMES="rts_pstor(misc/drivers/scsi)"
@@ -29,8 +25,16 @@ MODULESD_RTS_PSTOR_ADDITIONS=(
 )
 BUILD_TARGETS="default"
 BUILD_PARAMS="KERNELDIR=${KERNEL_DIR}"
-CONFIG_CHECK="~!MISC_RTSX_PCI"
+CONFIG_CHECK="~!MISC_RTSX_PCI !FORTIFY_SOURCE"
 ERROR_MISC_RTSX_PCI="CONFIG_MISC_RTSX_PCI: The in-kernel driver rtsx_pci is configured, which may have the same functionality than this driver. To make sure that your kernel loads only rts_pstor, the rtsx_pci module will be blacklisted."
+ERROR_FORTIFY_SOURCE="CONFIG_FORTIFY_SOURCE: this module is known to fail compiling when the hardening option CONFIG_FORTIFY_SOURCE is set"
+
+src_prepare() {
+	default
+
+	eapply "${FILESDIR}/fix-compile-kernel-5.0.0.patch"
+	kernel_is le 5 0 && eapply "${FILESDIR}/rts_pstor-makefile.patch" || eapply "${FILESDIR}/rts_pstor-makefile-kernel-5.1.patch"
+}
 
 pkg_postinst() {
 	elog "This driver is based on code published by Realtek. There is a driver in the kernel named rtsx_pci which"
diff --git a/sys-block/seekwatcher/Manifest b/sys-block/seekwatcher/Manifest
index 57204c7a6370..03aad013b901 100644
--- a/sys-block/seekwatcher/Manifest
+++ b/sys-block/seekwatcher/Manifest
@@ -1,6 +1,3 @@
-AUX seekwatcher-0.12_p20091015-dash-fix.patch 949 BLAKE2B 4f3983feda97063c8a191b90032f13eee62a1bab6f6cf741874b7527cce84d1b08b060ef2028954a48a628b2e52088f586d171fd0c77273c5a3f32d53a0252b8 SHA512 ff2e92adaacd5b4636bcfa626df079c021cbf92cd13fbc7c736a933d64d2cc3d568156582e0f99f736a60c1764c94511ca511fcff591107006c4a172bf29283a
-DIST seekwatcher-0.12_p20091015.tar.gz 105328 BLAKE2B 6ce83dc7655ad9b070b09c745ebff881e30f352955264c3cf18902293466896a2b8ca1454d00848777aa46e1026d9c44cdf2979c0a8cc1758d794efc3f5f8fb7 SHA512 fc35399900fac83bf2921a137059f1af23e65a778aad105a9cbb8bb869328723f7e2b3bb19b28e7eed04eca65a39cb637ba5932ee4f5f3a882a7b52715a9aded
 DIST seekwatcher-0.13.tar.gz 25811 BLAKE2B 72c574e239a346620eb5a1c574365f18dc745e926bfb4f191dd9997ff73b26e716ded9679481be34149c3e5e424077a23a264e7dabe9423eafb396f687085dbd SHA512 687c1190a4d62ee4d7237c6930358d69d2045a7fd5af19caf9fdde8dfae8fcc64ba2d382445af2b038bc31f77c356f31b8dbff2d52cdaf4320881d1b1340dd17
-EBUILD seekwatcher-0.12_p20091015-r1.ebuild 890 BLAKE2B 112d6c398422343be868afc9afdc2c766aed6fd0ec46108335a06d72175686596ce45633dccd2f66f53a8483f59b7cd39874a06c9b745ec710b143ae5f94d96a SHA512 64ad60fa4f3551a35e138cc3aeb31febf1978374fec806a094472ca8cfccbea6af7c23698a5ebdceb1469098c400ea24355d08261c0f3685f14287e1ad70d613
-EBUILD seekwatcher-0.13.ebuild 648 BLAKE2B 4057dcc162f44872b17e2ba40ff92a5d14d5c79be38e531a7c6368ec5c8874f255eab4baef556d576e24962948a033608c57c0ebf6be981c89b5b51487644cf7 SHA512 a25f46a938f26a0bdbbeadd5a425abfc3a5ac2456162972aca63f54c2f760e427f6b9ca9d21e8b0da8bc1b8222a0974054be31460425c9dfeb888648d9c3b2a2
+EBUILD seekwatcher-0.13.ebuild 646 BLAKE2B 26582b1672b3c3063dda68aa6a8571540ecd053391a1b18315058046e9cb749115cd01206333d252cf8dfe545bd5f580db501cfde6e21529be68d67de5d03347 SHA512 db078692250fdad2496514b7a957217ba914e7fc9af6b830f854b6d015a3b23b18a5128486aa2a4713f13db8cf5dca8833a3df41f6241bbaeef18d0ce80d5611
 MISC metadata.xml 326 BLAKE2B 21768c11bcab92a1bb978e7ed1be16b1b76525a957955894a1ca18ae5e5fd0103dc312c8dc09b586ed4b3d46f471ccf039a4180ba000b0f4e410b05d34f7f335 SHA512 0a77e934710066157e808d2848283a9d25d9db5c1ccd03292ddb35b812b996918c8ae731b75eb1d60518cf1d6ece5ee9db51ae4e8a964357cb66e77fcd1c3b06
diff --git a/sys-block/seekwatcher/files/seekwatcher-0.12_p20091015-dash-fix.patch b/sys-block/seekwatcher/files/seekwatcher-0.12_p20091015-dash-fix.patch
deleted file mode 100644
index 0742fb9d5dff..000000000000
--- a/sys-block/seekwatcher/files/seekwatcher-0.12_p20091015-dash-fix.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-commit e594df5c73ab550fb76895f75f71109eb3640c41
-Author: Sergei Trofimovich <slyfox@gentoo.org>
-Date:   Thu Feb 23 22:28:28 2012 +0300
-
-    seekwatcher: fix failure when /bin/sh points to dash
-    
-    Before the patch:
-    $ ./seekwatcher -t test.trace -o test.png -p 'sleep 5' -d /dev/sda2
-    > using tracefile ./test.trace
-    > sh: Syntax error: Bad fd number
-    > Empty blktrace run found, exiting
-
-Upstream status: sent, not applied yet
-diff --git a/cmd/seekwatcher b/cmd/seekwatcher
-index 7e96bd2..23cba1c 100755
---- a/cmd/seekwatcher
-+++ b/cmd/seekwatcher
-@@ -610,7 +610,7 @@ def run_blkparse(trace):
-         print "using tracefile %s" % os.path.join(trace_dir, x)
-         fh = tempfile.NamedTemporaryFile(dir=".")
-         os.system('blkparse -q -D ' + trace_dir + ' -i ' + x +
--                ' -d ' + fh.name + ' -O >& /dev/null')
-+                ' -d ' + fh.name + ' -O > /dev/null 2>&1')
-         loaddata(fh, rd)
-     return rd
- 
diff --git a/sys-block/seekwatcher/seekwatcher-0.12_p20091015-r1.ebuild b/sys-block/seekwatcher/seekwatcher-0.12_p20091015-r1.ebuild
deleted file mode 100644
index c845c1122a2d..000000000000
--- a/sys-block/seekwatcher/seekwatcher-0.12_p20091015-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils distutils-r1
-
-DESCRIPTION="generates graphs from blktrace to help visualize IO patterns and performance"
-HOMEPAGE="http://oss.oracle.com/~mason/seekwatcher/"
-#SRC_URI="http://oss.oracle.com/~mason/seekwatcher/${P}.tar.bz2"
-SRC_URI="https://dev.gentoo.org/~slyfox/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="dev-python/pyrex"
-RDEPEND="
-	|| (
-		dev-python/matplotlib-python2[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-	)
-	|| (
-		dev-python/numpy-python2[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-	)
-	>=sys-block/blktrace-0.0.20070730162628
-"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-S=${WORKDIR}/${PN}-b392aeaf693b # hg snapshot
-
-PATCHES=("${FILESDIR}"/${P}-dash-fix.patch)
diff --git a/sys-block/seekwatcher/seekwatcher-0.13.ebuild b/sys-block/seekwatcher/seekwatcher-0.13.ebuild
index 9fb2f9625e50..d079d0df137f 100644
--- a/sys-block/seekwatcher/seekwatcher-0.13.ebuild
+++ b/sys-block/seekwatcher/seekwatcher-0.13.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/trofi/seekwatcher/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="dev-python/cython"
diff --git a/sys-block/smp_utils/Manifest b/sys-block/smp_utils/Manifest
index 4c4b9f8eb835..88cffa250fcf 100644
--- a/sys-block/smp_utils/Manifest
+++ b/sys-block/smp_utils/Manifest
@@ -1,6 +1,6 @@
 AUX smp_utils-0.98-sysmacros.patch 1441 BLAKE2B fe219d09b873bc4eb318436188c56af45f50720fd3c5d02f0d67634a63512a999deea21fb01c5cc84e03832b5fe1a6b0a34638359c7400c062c6004ca2abb1ed SHA512 203c1ac85e84f37e9f404b74a7f37f832c775a933b96b0b3a678bcff46e96c48f2f46c9ba900f433477ff0c82621c3333439cd28a747e2391d98e0ee0b202063
-DIST smp_utils-0.98.tgz 497916 BLAKE2B 3f6104db689985917b8fc1ad3ed364e139615a56d1173cbea670f58dff0777632e9180698f6ac7d84959616ab74996f051639a4de1122cef751adfc8312f8fa8 SHA512 fae08a580219f3c7980f11a60863ca0eee3cea0ac582fc3a79cdf060bbe7251ad2a144c594d64c489e2681a0c437b02fe29362bfc7e1907a0504c965d6d74236
+DIST smp_utils-0.99.tar.xz 344292 BLAKE2B 3652a4772ab887c5f29f083f35667630440ebfe564064b791b57f24cb99359d83cb8961b48c64f4bf132a1a67a164aaa05e87a30133176d4979a530ec4050d3d SHA512 6be07fb4948f46aed4499b52fdaba00b2651048c22b429b99c28c1a45cc221324e423e6411f65bd2542c06a0658e19e1798e1633c2a6d7f65cef7990d86ae34c
 DIST smp_utils-0.99b4r151.tar.xz 323076 BLAKE2B f9fad9dc7b371574ea70cbedf76dbe8684d21c3658b712f24b1ee3594adcc2814b15bb892c776ea37e772f22b9322c1ee923aa13e2c984c40a0f5ff6e7868cb0 SHA512 c68bfc931d8d1f2b4ec68a60038fec2ff08a5603cdad5b825d6c29a678873a68027d8d174922db11e197efc30fa6a7f04db173122058be79d95ee81ce8a51011
-EBUILD smp_utils-0.98.ebuild 499 BLAKE2B 52647803df0dd18b5ad457383f0b9db1d124a0a9942a822d7aa1a158ffe96824a94c6ba4074dcae143d3cd86d50404bf3587c69b284aff230e3f3fe5598eec06 SHA512 e7d3ccdb4dbc8256999724736aa4cae50cdd6f2803f33613ff4d364b0146d9c14da2358e091d1b72499b7c5de8b6ad41991a36d01ced77196c6141153b1719a9
+EBUILD smp_utils-0.99.ebuild 685 BLAKE2B fc52ca21a840862026a8bc8a661788e19b886c8b8b30c83f31180cc5c360229a7caf79ead3854b4e25704721fc2c94b35adbb23ae7fe2b977d9b8e1b3596462c SHA512 67f0412fa38147389bd579c394f8e44329010d8b1e2af75397143c8a1ff48cef101eba369db27bd9a5b47dec7296edf9ee827d723244b56f5a3358cd7b7d6e92
 EBUILD smp_utils-0.99_beta4_p151.ebuild 600 BLAKE2B b4061af52c945049e8900cf4f7957a7572a396acfd8b6e00c7a1b25146f4f339ac62add7b03df37c6de3cf73b91da54e591c647f440eccb4de172599f714dfdd SHA512 644f6378a137e87a58016a3f91aa8b77b5ca53e12b9033b984c62299678442190916a9d3eefc38018cf5d6bbdbc8510065b6f03526278942a5352bc9b62a9e55
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-block/smp_utils/smp_utils-0.98.ebuild b/sys-block/smp_utils/smp_utils-0.98.ebuild
deleted file mode 100644
index d796c1cf8c92..000000000000
--- a/sys-block/smp_utils/smp_utils-0.98.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit autotools-utils
-
-DESCRIPTION="Utilities for SAS management protocol (SMP)"
-HOMEPAGE="http://sg.danny.cz/sg/smp_utils.html"
-SRC_URI="http://sg.danny.cz/sg/p/${P}.tgz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="static-libs"
-
-DOCS=( AUTHORS ChangeLog COVERAGE CREDITS README )
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-PATCHES=(
-	"${FILESDIR}"/${P}-sysmacros.patch #580258
-)
diff --git a/sys-block/smp_utils/smp_utils-0.99.ebuild b/sys-block/smp_utils/smp_utils-0.99.ebuild
new file mode 100644
index 000000000000..8e06ca005192
--- /dev/null
+++ b/sys-block/smp_utils/smp_utils-0.99.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Utilities for SAS management protocol (SMP)"
+HOMEPAGE="http://sg.danny.cz/sg/smp_utils.html"
+MY_PV="${PV/_beta/b}"
+MY_PV="${MY_PV/_p/r}"
+MY_P="${PN}-${MY_PV}"
+SRC_URI="http://sg.danny.cz/sg/p/${MY_P}.tar.xz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="static-libs"
+
+DOCS=( AUTHORS ChangeLog COVERAGE CREDITS README )
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable static-libs static)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/sys-block/targetcli-fb/Manifest b/sys-block/targetcli-fb/Manifest
index 2c474fa63b0b..42cea969c1db 100644
--- a/sys-block/targetcli-fb/Manifest
+++ b/sys-block/targetcli-fb/Manifest
@@ -2,5 +2,5 @@ AUX targetcli-fb-2.1.48-python3.patch 908 BLAKE2B 9407a1c6b576507479fe06f8f5c942
 DIST targetcli-fb-2.1.48.tar.gz 33777 BLAKE2B f24661777509a1e125cccaa12ca03eff9564e08bc3b5b3b1798b69a07bd7587b0089bcccbfa6c0166db51ec9f55fa663833e412ecab1614be43bcddf0521b1af SHA512 97351b29d8428e797f0cf7a7bab588f20368121d29fd8ed2afe2bf63aaf10aa7761e355e033772f6cbaf7aec2a1540cffae7dccad872a7e5885f200fa07dd420
 DIST targetcli-fb-2.1.49.tar.gz 34147 BLAKE2B 49ed4a610282af30308373cdf806832a3441dcab9a52cddb3f59bacdecb79f7308f316cc65f526d6ea1f9bb875d05e049e6cd7d99eb243f25546395ba6aaa38c SHA512 05fb6f638f808bf09089bdd110592b3ed3be49fc70cc1a71680de7bff40dc88425e69e9a99fdfcab712646cf131f78071edae46f214fdfee4b7090f47933c93a
 EBUILD targetcli-fb-2.1.48-r2.ebuild 918 BLAKE2B dec79afa54141475cd5ad813de3c48eaa264c17a2cda5a47d3e76ae078ff8d99215851c06a17700e38c907a777ab964d5192f0646f89fca6b903ea39ac8d7d4c SHA512 c8c32e509033910985628efb8df9b78d7914e7d54a0b2cb0308e5012697a93b1bb9beabeabc8a4674a2433ec796d65b2326e983fc2c3a2b0cc1ad0c521fb15b5
-EBUILD targetcli-fb-2.1.49.ebuild 817 BLAKE2B 202db873647763fd68b268cfeb5b949e29dbe26173a775c1f50303bd13f05aa16a56e7b152946f342fc97ba87913b37e57f399523c6f8eb2473318120ecf92eb SHA512 3866f8324386d28a99b41225488c746a1a2e2a8b873b99b9fdd5cecb5d8d95b17f78938694de701ec05a70e484595cc55ab018827b8d2873eebaa1f73b4b2457
+EBUILD targetcli-fb-2.1.49.ebuild 816 BLAKE2B 6e7f4e1a67965fdd312ae9faa74e199f0352e583c7c42eefc060dfeb98cdb55ae57ea8996285c5622c22c7ed6ecd3a1384050e7257ea1945726a4dec7082b99c SHA512 e5120e747b7bc30aeb695085e3be746a6e29b430de0e1d17ee9311e37ecabff1cd83916b47757d7a467b7af5ff972ec6ffa42114e9a700ce83bcd3e8a0d97840
 MISC metadata.xml 852 BLAKE2B 375f8bd771785bd8d928dc5975b5e7157355693b743fca1e28bca06a75bf6425f49a1df304962aeabb0ae9fd85fa84cd7db3ed23309dcb93e946da8417afe173 SHA512 af99e8996b35debdc6780b95d36201e701e93c2be464dc737d5eb018a1c2e907ee94a53a9901173d8a76d0d0f2948556e7be8e2b8d3cf8c3c8cdcf7de69d1749
diff --git a/sys-block/targetcli-fb/targetcli-fb-2.1.49.ebuild b/sys-block/targetcli-fb/targetcli-fb-2.1.49.ebuild
index d58e2dafabd4..3160fb70e92c 100644
--- a/sys-block/targetcli-fb/targetcli-fb-2.1.49.ebuild
+++ b/sys-block/targetcli-fb/targetcli-fb-2.1.49.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/open-iscsi/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.ta
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="dev-python/configshell-fb[${PYTHON_USEDEP}]
diff --git a/sys-block/thin-provisioning-tools/Manifest b/sys-block/thin-provisioning-tools/Manifest
index 2217c646b638..ac9c2b0aed2b 100644
--- a/sys-block/thin-provisioning-tools/Manifest
+++ b/sys-block/thin-provisioning-tools/Manifest
@@ -4,9 +4,9 @@ DIST thin-provisioning-tools-0.7.0.tar.gz 230595 BLAKE2B 00238a682f80600e3a5bb6d
 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 1315 BLAKE2B d258104ff7c55a9027dd8c77de74aeee3452863e32bd434b6e7d4a99254b7495cb7f37e1c5917a6d4ac620088678b96b4593bfa24d1a0b353f61abe53b6d29fb SHA512 309ca45f6d8b2699d80d1176002b962335401f191cfd432e0b4fc797bd85151487164b13cd3afaa851a2003b695f6984fbe6f99752931b895a9d450882a4a843
-EBUILD thin-provisioning-tools-0.7.6.ebuild 1326 BLAKE2B 462e5596834ea37a95fe96997b0f0c9f0c1841a831de7a038144f5a7ef77081657640c61d81480f04879bba44dd19f7579fe93add656328a58fd248c83d13040 SHA512 ff35d77e219c810bee387c375601355793dcaca3a65b75ab5444e774adc91073e0600318c3fb22da07cb84081fd603cca24d6bd05bbf8d9f7dfdf0963ad77866
-EBUILD thin-provisioning-tools-0.8.3.ebuild 1519 BLAKE2B 1a52e440bdd6a5495f2c3d169d2033de761e4dc49c3dbce2538e9620d291cc8dc9a89b5668bf51a3ac498a671d57cc79bcd511b9820fe24dab90fac59e6ac7c7 SHA512 08bd6a7aee12590887d68028ea3489e28f344dcb74b20c7ebac60a236b66c11b189a05c891306730238f81f78e6bd0bd4e93b9fcf5b9005143cda2fca897e903
-EBUILD thin-provisioning-tools-0.8.5.ebuild 1567 BLAKE2B d92a9d00704f0d41be38c7a3482e6b5afcfca741200d5a1ebe70171595689fd1eb5032aa5320753078b03e7ad3eba7f7a6aad5737f9b64b5e1a9f9f619f9034b SHA512 591cb11e927b8b93bde740fc85bbb3c48630eac92bc79a8726a3c39ebdc377dd822745c621b4441b07c4549adec0209079165099d2ed14981125648c25571159
-EBUILD thin-provisioning-tools-9999.ebuild 1519 BLAKE2B 1a52e440bdd6a5495f2c3d169d2033de761e4dc49c3dbce2538e9620d291cc8dc9a89b5668bf51a3ac498a671d57cc79bcd511b9820fe24dab90fac59e6ac7c7 SHA512 08bd6a7aee12590887d68028ea3489e28f344dcb74b20c7ebac60a236b66c11b189a05c891306730238f81f78e6bd0bd4e93b9fcf5b9005143cda2fca897e903
+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
 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 cd40e9e4fa3f..66c1699c8261 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
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/jthornber/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static test"
 RESTRICT="!test? ( test )"
 
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 5804a752f1fc..faad3397c9c4 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
@@ -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=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/jthornber/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="static test"
 RESTRICT="!test? ( test )"
 
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.8.3.ebuild
index 9cbdba2134ad..172223fe821b 100644
--- a/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.8.3.ebuild
+++ b/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.8.3.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
@@ -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 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 else
 	inherit git-r3
 	EGIT_REPO_URI='https://github.com/jthornber/thin-provisioning-tools.git'
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 690cc6877c7d..7ef022f2d096 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
@@ -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
@@ -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 ~sh ~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'
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 9cbdba2134ad..172223fe821b 100644
--- a/sys-block/thin-provisioning-tools/thin-provisioning-tools-9999.ebuild
+++ b/sys-block/thin-provisioning-tools/thin-provisioning-tools-9999.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
@@ -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 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 else
 	inherit git-r3
 	EGIT_REPO_URI='https://github.com/jthornber/thin-provisioning-tools.git'