gentoo resync : 22.05.2021

33 files changed, 34 insertions, 611 deletions

diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz
index 73e54641550b..3743fadca7a7 100644
--- a/sys-block/Manifest.gz
+++ b/sys-block/Manifest.gz
diff --git a/sys-block/aoetools/Manifest b/sys-block/aoetools/Manifest
index f84e2f72b19a..d7c1aa7f884e 100644
--- a/sys-block/aoetools/Manifest
+++ b/sys-block/aoetools/Manifest
@@ -1,6 +1,4 @@
 AUX aoetools-32-build.patch 1099 BLAKE2B 2ae126ec8f8e9a1556a5a7354153e336715510a2fbc56a30d830e6708e338ae3da9b75cd6566bfc8b458600b5165e398a322a4cb60147d1b8ac86c54d87407b3 SHA512 23b7a41847fca44d12e7cf3927b2ee07c0cb3d3dfd57082107925c7d29ca707bd621835eec6daed8cdfc8926caa893c51b3e7fd9a41bec642e2a4468bba65ed4
-DIST aoetools-36.tar.gz 36650 BLAKE2B 9bb1d8dca70c869e456ca5d6aec85282b0b62daed0f0b6d8a81274975547c2b879f8078019823b4106914bcbb2f45eb5489d8a7d737f37a8b52457c1d95abb1c SHA512 ee23087bed87308e34d498af41fd0754b9867555822355103182e1194982645a18d59bd7ff5115b81fb40f8cbefbe5368199c9e5d531544e0e2375582be46ba1
 DIST aoetools-37.tar.gz 36167 BLAKE2B d928e600a610020172d96a12a0ff97f57b29d13bb104c4592d83626ffe525a0eb5f1272209d0eadc4e68dea949f0bbbc33527520c6b5b01893017e1f16de8d5f SHA512 4ff8f48f20d5ce8fb795373eff959f827b2c829d71c5ac5e63bcc2102aa7205d20991b70766330eed83b13b9731486fb6db777df13ba682f65823f455421632e
-EBUILD aoetools-36.ebuild 478 BLAKE2B 3b8b6a6170c94626920555b8d1b75edc09296d93d5048e3dc4598b3fbfc108153dbe67935fd8c16f1994e5af846ea52d1ddf1ede049a8502bc97b3c2a8153676 SHA512 df3c96fd4a1cefd38e6ad070cdb287990cbdcf971a9632fc43a64f0ead374e43fae227c811e7a04276503b501e5fcbe2030b919a821779474d4f3e10b10deb86
-EBUILD aoetools-37.ebuild 539 BLAKE2B b5579d6fe06d2f668ccc21828e20478ceb9fc49eb2d2f4875078fd7fc80493435c1923bffb99afa52fbd50318301fd25624df2a53d1d9f34ed970fb3618be3ea SHA512 bad708c0022f62195e4e8642e9ac47c2e1777ddc4f2067ef23b2468d3136f4e5206375516700c10c2b2217bd65ebf4c668986173f61e868bfb68d7414deed844
+EBUILD aoetools-37.ebuild 494 BLAKE2B d241d868459b50d90a7deda75237ab63637c82c091b1651618e7191ff611b89adaac31c021ddb0fa4adf35f511a5a32cb8135f9d7c9c0dc25e7ef5308fbeeb02 SHA512 023b696587004c858699a42ef2902dc2594893283cc38ef561480cbb2563303407c53075cdcaf83ca7e8dbde93b24b95f1a43899a88dabeb20624210cb909d9b
 MISC metadata.xml 328 BLAKE2B b04b8d9c3016fc84883de505bb4b5fa0dd0f97d8a07c1e84995b7b2931f6b356cfb0f59b7665f7a9c63955a3ee7bae5d37379a326eafe20d58840bd236562718 SHA512 5f04425d524c4535b0b3b42a2c310afa42f09649929f08e12bb491ae808f2fb8dbd08e3c153426bdcef328291b9b19feea2c557ef0a2c6e3a98fc69824c11ca5
diff --git a/sys-block/aoetools/aoetools-36.ebuild b/sys-block/aoetools/aoetools-36.ebuild
deleted file mode 100644
index 4eadabe70a5b..000000000000
--- a/sys-block/aoetools/aoetools-36.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit epatch toolchain-funcs
-
-DESCRIPTION="tools for ATA over Ethernet (AoE) network storage protocol"
-HOMEPAGE="http://aoetools.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 ~sparc x86"
-IUSE=""
-
-DOCS="NEWS README"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-32-build.patch
-	tc-export CC
-}
diff --git a/sys-block/aoetools/aoetools-37.ebuild b/sys-block/aoetools/aoetools-37.ebuild
index 08add0f74920..ffa4bd60f08e 100644
--- a/sys-block/aoetools/aoetools-37.ebuild
+++ b/sys-block/aoetools/aoetools-37.ebuild
@@ -1,27 +1,21 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
 inherit toolchain-funcs
 
 DESCRIPTION="tools for ATA over Ethernet (AoE) network storage protocol"
 HOMEPAGE="https://github.com/OpenAoE/aoetools"
 SRC_URI="https://github.com/OpenAoE/${PN}/archive/${P}.tar.gz"
+S="${WORKDIR}/${PN}-${P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-S="${WORKDIR}/${PN}-${P}"
-
-DOCS=( NEWS README )
+KEYWORDS="amd64 ppc ppc64 ~sparc x86"
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-32-build.patch
-)
+PATCHES=( "${FILESDIR}"/${PN}-32-build.patch )
 
-src_prepare() {
-	default
+src_configure() {
 	tc-export CC
 }
diff --git a/sys-block/di/Manifest b/sys-block/di/Manifest
index 68c6a3e2e85a..9a19f09f3818 100644
--- a/sys-block/di/Manifest
+++ b/sys-block/di/Manifest
@@ -1,8 +1,4 @@
 AUX di-4.33-build.patch 1041 BLAKE2B 971d2cdcab457ede532c490d2a584ea76d7c7181587e670a18ee51431716e9fa64c1acc89ae41b51fadf58829e3d0edbd34181bd439adc50f028eac49786115f SHA512 5ed513a857585bd460e530d406488729e3b75f9a945faa600de1c41ed30762f2a5ed578ee10c5df16f3980b2063a05648d6c85c2882da8ef40e657e058788214
-DIST di-4.48.0.1.tar.gz 227599 BLAKE2B 128e72c1b3bd5b61de9a7df14d66c746b4e41e2b4a303853922f400e62bf200be82f320ca78b94d2d40bb661f2cf647d28657a807fc0bd4fc42cdc6a2e843182 SHA512 a5fbfd1c3790694b03a870ab56c61abe3f23bac12b41bdfe3d572d618a9f51194796d7fe020ff1fb196c422274ad8b2bce8d09cc01f8ba75b30696f5df11dc8c
-DIST di-4.49.tar.gz 228536 BLAKE2B 1f22cc59b97c9eb41a8af984811ff5817b49fdaf8315b76968bce269fd393cd3a26da947adbd830615316c454abab71a8547ef9448ad7f21be7d107b5d561cc8 SHA512 3997057f02c2862cf238070d1a520dc1fbbbc5dc103ad524189a97d6c114ef24a33e6fc9c64e32d8eb07c4c0241ed9772c37fb078d9708426da1f5864c4718d5
 DIST di-4.50.tar.gz 229467 BLAKE2B b597f2d16d6d1003711e301fc584ca5a1aee90bfb041d1b198348954864bf1000a0e19ca5dcc2c56683c0ff1bbfa22365b9ca5a26f2d7936374e31d479e4d05d SHA512 6183004c10d121054d310e2e5ef1e96ceffd38012c3b3d80f1ce1f0155269334ae418ce651b74daa261e255b76d1999be6975fbc253ea320a8f6ba410166e312
-EBUILD di-4.48.0.1.ebuild 724 BLAKE2B 43dcdebcd81b1f4776b84ded61adbd3afa7c83b77cde50e0ee7586d7cc40d603b97bafd5b183b181b0f4682b41a0e209fed01be6d8951ff3a37199ab64631421 SHA512 f9b8b879ce3fdf3208f3b24d5ec39e14d1a8754f37505ec784be74d5ea1b53a3d1931d4c35b0d23d10c106db9454396e903b1c20a551d66616b11be39c703c97
-EBUILD di-4.49.ebuild 728 BLAKE2B 3d02b92353cad5eaca264dd5fbe6997f746f7da9cfbc4d225b6d93cf592817e668e80d41015154a48db1dadb7a0713c137d27c7f5a469a385865f885017cd410 SHA512 27e107843cd750005ae9bb2e912ee360d2cf2951f40817781fd91f9cfa32869eb703f78cf777797b01f17e545a84d446812d938f3081ced26feb46f29ccc1e33
-EBUILD di-4.50.ebuild 728 BLAKE2B 3d02b92353cad5eaca264dd5fbe6997f746f7da9cfbc4d225b6d93cf592817e668e80d41015154a48db1dadb7a0713c137d27c7f5a469a385865f885017cd410 SHA512 27e107843cd750005ae9bb2e912ee360d2cf2951f40817781fd91f9cfa32869eb703f78cf777797b01f17e545a84d446812d938f3081ced26feb46f29ccc1e33
+EBUILD di-4.50.ebuild 724 BLAKE2B 43dcdebcd81b1f4776b84ded61adbd3afa7c83b77cde50e0ee7586d7cc40d603b97bafd5b183b181b0f4682b41a0e209fed01be6d8951ff3a37199ab64631421 SHA512 f9b8b879ce3fdf3208f3b24d5ec39e14d1a8754f37505ec784be74d5ea1b53a3d1931d4c35b0d23d10c106db9454396e903b1c20a551d66616b11be39c703c97
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-block/di/di-4.48.0.1.ebuild b/sys-block/di/di-4.48.0.1.ebuild
deleted file mode 100644
index c372aade5cee..000000000000
--- a/sys-block/di/di-4.48.0.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit toolchain-funcs
-
-DESCRIPTION="Disk Information Utility"
-HOMEPAGE="https://diskinfo-di.sourceforge.io/"
-SRC_URI="mirror://sourceforge/diskinfo-di/${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="nls"
-
-RESTRICT="test" #405205, #405471
-
-BDEPEND="nls? ( sys-devel/gettext )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.33-build.patch
-)
-
-src_configure() {
-	emake checkbuild
-	emake -C C config.h
-}
-
-src_compile() {
-	emake prefix=/usr CC="$(tc-getCC)" NLS=$(usex nls T F)
-}
-
-src_install() {
-	emake install prefix="${D}/usr"
-	# default symlink is broken
-	dosym di /usr/bin/mi
-	dodoc README.txt
-}
diff --git a/sys-block/di/di-4.49.ebuild b/sys-block/di/di-4.49.ebuild
deleted file mode 100644
index 0b91156a628d..000000000000
--- a/sys-block/di/di-4.49.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit toolchain-funcs
-
-DESCRIPTION="Disk Information Utility"
-HOMEPAGE="https://diskinfo-di.sourceforge.io/"
-SRC_URI="mirror://sourceforge/diskinfo-di/${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="nls"
-
-RESTRICT="test" #405205, #405471
-
-BDEPEND="nls? ( sys-devel/gettext )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.33-build.patch
-)
-
-src_configure() {
-	emake checkbuild
-	emake -C C config.h
-}
-
-src_compile() {
-	emake prefix=/usr CC="$(tc-getCC)" NLS=$(usex nls T F)
-}
-
-src_install() {
-	emake install prefix="${D}/usr"
-	# default symlink is broken
-	dosym di /usr/bin/mi
-	dodoc README.txt
-}
diff --git a/sys-block/di/di-4.50.ebuild b/sys-block/di/di-4.50.ebuild
index 0b91156a628d..c372aade5cee 100644
--- a/sys-block/di/di-4.50.ebuild
+++ b/sys-block/di/di-4.50.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/diskinfo-di/${P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="nls"
 
 RESTRICT="test" #405205, #405471
diff --git a/sys-block/mbuffer/Manifest b/sys-block/mbuffer/Manifest
index d6f41f7169dd..54e2756c83af 100644
--- a/sys-block/mbuffer/Manifest
+++ b/sys-block/mbuffer/Manifest
@@ -1,12 +1,7 @@
 AUX mbuffer-20180410-sysconfdir.patch 897 BLAKE2B 1fc57be6f5ce11f483d43dc69c9e4120b09a4c59caaee90deefd5500058ea0c8b9cd6b9b3dea1a2f21733acf4eb8a922171d791e57d658275997ca951f73559e SHA512 36964604338a0bfd0e9cb55d17b307f32dfe09d280019e8083e5909b81e091887bb8f360ef9aebf21eb8448a3d9ba305a6f7a7bc35ea4884418bb7d67e9fadb0
-AUX mbuffer-20200505-find-OBJDUMP.patch 377 BLAKE2B 7b9d8660d85532a5dff19195ab884fa37155ec603b414e576766c593295388c7f3ac2c3f6e333dbb5dbdf794036aedc814435b35bf746b10a5a0575905bcdbfb SHA512 4228741aeece32872c11da8a6840d8a7de6db77d4663edb44a8875384c70ba0807929bbb70c397f870ea1c18c5d0c0a224ad90f3d4e7094246496b461a5e6bff
 AUX mbuffer-20200929-find-OBJDUMP.patch 279 BLAKE2B f22f74549eb2fba1061141616097fc01b987c846302a0fd59aaf8a0236a291207a02f0a85ec542fb217377eb40eb0983cd450aaf9a56f3df7838c29f31ab663a SHA512 20a9969de11f6eaf398627a306465df6b43ccb640176c4743ce8e8aa59b06f1837b0ef968223a0770c7aa1cf1959713526fa064f3eb54bbfabb067d834e510c0
-DIST mbuffer-20200505.tgz 146020 BLAKE2B b85742f710405e29775c7d25e9c1be733fd94d7157018017b7c8fb5b5cdeab7fa8819b024d297d96af960a73a8982fdeaefe50627c605f797df4d75b0c15435f SHA512 8a1e5721869fd705d02486cf93467bfe0a59b58789826ca337c18a023e9fbb18c1651211bfebdea4cdd45772ad23d0715bb3892bed04ce66f5fbe72406cde9f7
 DIST mbuffer-20200929.tgz 147855 BLAKE2B abbcb4b29013ed24b4135a8b7576a0e728c3b5f1987558f0582711b1b00333caea8b55a02c4506ac179a4dae04977ee64572df09a210bf34bd71fd336be7e418 SHA512 332106205ea8743c9cf47529106c04ac15801a02b116d8e0c0fd3baadad51331c9f4ba1c8fa125edb42940cf401048a45ba23e2dac0e5189671bcf0ecee36996
-DIST mbuffer-20210209.tgz 147894 BLAKE2B ff6b1da468d34b1fef66178200f68998da0ef4042424845157afbd59e53dbef9e3d003ec9c1a663b28c0e3291d515841bb0a29dabf72a4dd781f6dde2b69b17d SHA512 82a3fd769c6935164db41dbc2e189fef27068c5d4604be923f42f6a9ba3dc3668e6918ba838a0015e9b5becde8b42c9268aa679e3aadb770c517873790f842d1
 DIST mbuffer-20210328.tgz 148009 BLAKE2B b369fdae908cfa239e70d092f512f1613215f1a38e5f2dba9403edeb5579fe14a099f0b9950572c1e294c7d5938bd5a363a1cc3239b4553ecd24c6b805fbfe27 SHA512 69f7cac7fe49a86944092d642c6138455ba95da8e6d00abd41b37d126a9f03c3252e69795c5fb5bf8e56d0ce1461bde6b51f48c5eb7073ee49ee4e6df83d834d
-EBUILD mbuffer-20200505.ebuild 1519 BLAKE2B be5a13fa42bf39a6df4480fb29e666cfe8767f12f74f34e98cbabfee8f31c9fad8fe3c4c4bf958aae25b8502c8fd39b39bc1cdf6cb8bad22b18ea233472d3d31 SHA512 51d7881cf3b395ae5aaad49f239c6be8877f5c4a6874723070a045006b9de5d338cfda66883682b9a243d1def7df353d66c45525c4ef125f9eaa4e8666fce060
 EBUILD mbuffer-20200929.ebuild 1521 BLAKE2B da7dd2378791a6413f2736dbf2b2b9221185d4d3224afbd01c70695f6e173a72c527df1406c25a01680bd0a4d6b8fd4bdc2703fb7f7047043f2f8dae49447e76 SHA512 dd974612b0cf04bda6c60cb841bd1419b76702091a493ad907baa16f58109715dff4f9b1399bcd758fa470043e629605a6ccadde396a8b5f4f79a39a6012f7fa
-EBUILD mbuffer-20210209.ebuild 1525 BLAKE2B 7e679c246ce656064853ec65561a425f0e0d2c74980008e9d1213d72c0320d1b0bd0d3e8b513b45a2e46cd516d9bdbf9eef6eba313ec927e6039e551dafa4399 SHA512 02c9cb2c90a0cf0561704fa688449296182ae3e3e74452013fcc1e719be525e6bb72e36dcc99efb2689e49b3e5672fe4d0e850dfdcb72c04bd589badbf36649c
 EBUILD mbuffer-20210328.ebuild 1525 BLAKE2B 7e679c246ce656064853ec65561a425f0e0d2c74980008e9d1213d72c0320d1b0bd0d3e8b513b45a2e46cd516d9bdbf9eef6eba313ec927e6039e551dafa4399 SHA512 02c9cb2c90a0cf0561704fa688449296182ae3e3e74452013fcc1e719be525e6bb72e36dcc99efb2689e49b3e5672fe4d0e850dfdcb72c04bd589badbf36649c
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-block/mbuffer/files/mbuffer-20200505-find-OBJDUMP.patch b/sys-block/mbuffer/files/mbuffer-20200505-find-OBJDUMP.patch
deleted file mode 100644
index 93fe6265e2ae..000000000000
--- a/sys-block/mbuffer/files/mbuffer-20200505-find-OBJDUMP.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -109,7 +109,7 @@ AC_PATH_PROG(CP,cp)
- AC_PATH_PROG(MT,mt,AC_MSG_WARN(could not find the program mt - you might need this if you want autoloader support))
- AC_PATH_PROGS(TAR,[gtar tar])
- AC_PATH_PROG(AWK,awk)
--AC_PATH_PROGS(OBJDUMP,objdump gobjdump)
-+AC_CHECK_TOOLS(OBJDUMP, [gobjdump objdump])
- AC_SYS_LARGEFILE
- AC_STRUCT_ST_BLKSIZE
- 
diff --git a/sys-block/mbuffer/mbuffer-20200505.ebuild b/sys-block/mbuffer/mbuffer-20200505.ebuild
deleted file mode 100644
index 0d0ef3285dbb..000000000000
--- a/sys-block/mbuffer/mbuffer-20200505.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="M(easuring)buffer is a replacement for buffer with additional functionality"
-HOMEPAGE="https://www.maier-komor.de/mbuffer.html"
-SRC_URI="https://www.maier-komor.de/software/mbuffer/${P}.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ppc x86"
-IUSE="debug ssl test"
-
-REQUIRED_USE="test? ( ssl )"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="ssl? (
-		dev-libs/openssl:0=
-	)"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-20180410-sysconfdir.patch"
-	"${FILESDIR}/${PN}-20200505-find-OBJDUMP.patch"
-)
-
-src_prepare() {
-	ln -s "${DISTDIR}"/${P}.tgz test.tar #258881
-
-	# Enforce MAKEOPTS=-j1 because src_test() spawns multiple listener
-	# using same port and src_install may have problems (with /etc folder)
-	export MAKEOPTS=-j1
-
-	default
-
-	mv configure.in configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable ssl md5)
-		$(use_enable debug)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	if has usersandbox ${FEATURES} || has network-sandbox ${FEATURES}; then
-		ewarn "Some tests may fail with FEATURES=usersandbox or"
-		ewarn "FEATURES=network-sandbox; Skipping tests because"
-		ewarn "test suite would hang forever in such environments!"
-		return 0;
-	fi
-
-	default
-}
-
-pkg_postinst() {
-	if ! has_version "app-arch/mt-st"; then
-		elog ""
-		elog "If you want autoloader support you need to install \"app-arch/mt-st\" in addition!"
-	fi
-}
diff --git a/sys-block/mbuffer/mbuffer-20210209.ebuild b/sys-block/mbuffer/mbuffer-20210209.ebuild
deleted file mode 100644
index b5df3c74c1a2..000000000000
--- a/sys-block/mbuffer/mbuffer-20210209.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="M(easuring)buffer is a replacement for buffer with additional functionality"
-HOMEPAGE="https://www.maier-komor.de/mbuffer.html"
-SRC_URI="https://www.maier-komor.de/software/mbuffer/${P}.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
-IUSE="debug ssl test"
-
-REQUIRED_USE="test? ( ssl )"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="ssl? (
-		dev-libs/openssl:0=
-	)"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-20180410-sysconfdir.patch"
-	"${FILESDIR}/${PN}-20200929-find-OBJDUMP.patch"
-)
-
-src_prepare() {
-	ln -s "${DISTDIR}"/${P}.tgz test.tar #258881
-
-	default
-
-	mv configure.in configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable ssl md5)
-		$(use_enable debug)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	if has usersandbox ${FEATURES} || has network-sandbox ${FEATURES}; then
-		ewarn "Some tests may fail with FEATURES=usersandbox or"
-		ewarn "FEATURES=network-sandbox; Skipping tests because"
-		ewarn "test suite would hang forever in such environments!"
-		return 0;
-	fi
-
-	# Enforce MAKEOPTS=-j1 because src_test() spawns multiple listener
-	# using same port and src_install may have problems (with /etc folder)
-	local -x MAKEOPTS=-j1
-
-	default
-}
-
-pkg_postinst() {
-	if ! has_version "app-arch/mt-st"; then
-		elog ""
-		elog "If you want autoloader support you need to install \"app-arch/mt-st\" in addition!"
-	fi
-}
diff --git a/sys-block/nbd/Manifest b/sys-block/nbd/Manifest
index 70e0a58475ab..333f5cd9a5cc 100644
--- a/sys-block/nbd/Manifest
+++ b/sys-block/nbd/Manifest
@@ -1,8 +1,4 @@
-DIST nbd-3.19.tar.xz 524412 BLAKE2B 21669bfe3d34789725895511b1b65be83f85c315992d973db6737cb151ffa48c69ca8bef7dbce513d6f12551b22d063a951644fcaadbec5c115672040b2af8e7 SHA512 0916b411857045af6e01032b3093e295e7f3cfb1ae92f25adb03d97d3196741f8805104c627b17ad4f7f4305db3a4bcd5516bfd2c60fbea02b497dc296f97a16
-DIST nbd-3.20.tar.xz 535136 BLAKE2B e707ab5565ca2281052d04e0b8854222a14b3dd365a2bb71b6544a9253204aad49df652bb888a035fbcc3b352530ccf59ab5374280ae78feea012f91fd4fa24c SHA512 d115939d8f086a1d99637d71453cbcc000a9145a85912a7edf701fad1b90d79e7bba1bc065fc54baa20c8a7665f47ad886cf8493bbabb15854eeede45cf176bc
 DIST nbd-3.21.tar.xz 523472 BLAKE2B 8601306966b75e5000e34d784175f287553d478e8367d488b9a3c1c11bcb7345a4ba898f02a94b8e927fbded1d3a563a4f0369ad7b49b14dcb6f5ea8d91812f3 SHA512 5dc238e6f45eb230a6f92493a8c3b4891dee98fc47e120e59c3ca31c0a698537ca03f78e43c5e7089d93d548a22b5e3853ba228536d2fc688c3edf4a590fdb3f
-EBUILD nbd-3.19.ebuild 1295 BLAKE2B 48593bf37c7960ee2bac437e447c5000f776b31e3c5ae960b29fa126651a24b8d163397303e1d60ddf6805e8fbf1eb7da424a9f17cce965a3364efe5e392c693 SHA512 62c3e5d72ab82bac59a5bae71e05231d7cdfe2102799c5e6d345987cfe4a94fba4b69343e9615b2e2bbc168bac4e394ed190e891eebdee97e814f96c4d23d4dd
-EBUILD nbd-3.20.ebuild 1309 BLAKE2B 26288bdfdb8cda4425f74618119f089bd073ff4cd51b0a2fcdbf7636f4e399cb43117bf30dd9b2fe11f79dd33be5487a061f7804d1b6009c17c3bfd8c50c58bb SHA512 14ecb279342da915ebaedfd8a4ffaa4051f0c528f3852e9c3b9f47421995f81de8d7053b569728f7b0fe9aa2c76c4ccf8797a189b1156166253bb053bf7b33bc
-EBUILD nbd-3.21-r1.ebuild 1391 BLAKE2B 972f386515c90969add5399770d5cdb5eee86f246357ac620d13a24efbd52067d21486d31f8fc15747511afdacb04016581a3f34e77583f3243b4621a182ec81 SHA512 7b85ad69be35850d5cceac88d8c53054c0d330b47313e7e80ab14a43312e0b9b2f299d9d7832f2fe52b688a65fd37efc3173144add13f7df26edc84bfeb03b4c
+EBUILD nbd-3.21-r1.ebuild 1386 BLAKE2B 94b7f258041f7cf8b0e492ff3ca9b590041b534aa8ef3b08d0ff7567eb4c673ee0512adf94a0bfd6b80bb00ed825b3172071a9a5aeeac3bd3be53116276b7553 SHA512 a5a5e49e15dc7111d5f0bf7c017180f06067172e11682e25de2a3b852ce15af3ec62edd8c0306f36f34b3b04b9bf55c3e858cec6930cd8a6bcddd032c92f5d46
 EBUILD nbd-9999.ebuild 1391 BLAKE2B 972f386515c90969add5399770d5cdb5eee86f246357ac620d13a24efbd52067d21486d31f8fc15747511afdacb04016581a3f34e77583f3243b4621a182ec81 SHA512 7b85ad69be35850d5cceac88d8c53054c0d330b47313e7e80ab14a43312e0b9b2f299d9d7832f2fe52b688a65fd37efc3173144add13f7df26edc84bfeb03b4c
 MISC metadata.xml 489 BLAKE2B 13de137846e31045a97f7672b54d57e90dfaa1fc5af93ea634db818fa289a088d2a0aa8be2ca14c5f68c2fcace77373ae991425730fce7fee8fef1790fc54053 SHA512 b03527f176309631c352662713ce1dfd9ba1c1325dfe3180047edc01e440c92885a3f17cc7ca170ec9add3ada0022d34b455de25e7117b99b795a30afc3971a1
diff --git a/sys-block/nbd/nbd-3.19.ebuild b/sys-block/nbd/nbd-3.19.ebuild
deleted file mode 100644
index 34c5f3a353a8..000000000000
--- a/sys-block/nbd/nbd-3.19.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Userland client/server for kernel network block device"
-HOMEPAGE="http://nbd.sourceforge.net/"
-if [[ "${PV}" = 9999 ]] ; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/NetworkBlockDevice/nbd.git"
-else
-	SRC_URI="mirror://sourceforge/nbd/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~sparc x86"
-fi
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="debug gnutls netlink zlib"
-
-RDEPEND="
-	>=dev-libs/glib-2.26.0
-	gnutls? ( >=net-libs/gnutls-2.12.0 )
-	netlink? ( >=dev-libs/libnl-3.1 )
-	zlib? ( sys-libs/zlib )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-if [[ "${PV}" = 9999 ]] ; then
-	DEPEND+="
-		app-text/docbook-sgml-dtd:4.5
-		app-text/docbook-sgml-utils
-	"
-fi
-
-src_prepare() {
-	default
-	if [[ "${PV}" = 9999 ]] ; then
-		emake -C man -f Makefile.am \
-			nbd-server.1.sh.in \
-			nbd-server.5.sh.in \
-			nbd-client.8.sh.in \
-			nbd-trdump.1.sh.in \
-			nbdtab.5.sh.in
-		emake -C systemd -f Makefile.am nbd@.service.sh.in
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-lfs
-		$(use_enable !debug syslog)
-		$(use_enable debug)
-		$(use_enable zlib gznbd)
-		$(use_with gnutls)
-		$(use_with netlink libnl)
-	)
-	econf "${myeconfargs[@]}"
-}
diff --git a/sys-block/nbd/nbd-3.20.ebuild b/sys-block/nbd/nbd-3.20.ebuild
deleted file mode 100644
index fad2a1deedee..000000000000
--- a/sys-block/nbd/nbd-3.20.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Userland client/server for kernel network block device"
-HOMEPAGE="http://nbd.sourceforge.net/"
-if [[ "${PV}" = 9999 ]] ; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/NetworkBlockDevice/nbd.git"
-else
-	SRC_URI="mirror://sourceforge/nbd/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-fi
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="debug gnutls netlink zlib"
-
-BDEPEND="virtual/pkgconfig"
-
-RDEPEND="
-	>=dev-libs/glib-2.26.0
-	gnutls? ( >=net-libs/gnutls-2.12.0 )
-	netlink? ( >=dev-libs/libnl-3.1 )
-	zlib? ( sys-libs/zlib )
-"
-DEPEND="${RDEPEND}"
-
-if [[ "${PV}" = 9999 ]] ; then
-	DEPEND+="
-		app-text/docbook-sgml-dtd:4.5
-		app-text/docbook-sgml-utils
-	"
-fi
-
-src_prepare() {
-	default
-	if [[ "${PV}" = 9999 ]] ; then
-		emake -C man -f Makefile.am \
-			nbd-server.1.sh.in \
-			nbd-server.5.sh.in \
-			nbd-client.8.sh.in \
-			nbd-trdump.1.sh.in \
-			nbdtab.5.sh.in
-		emake -C systemd -f Makefile.am nbd@.service.sh.in
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-lfs
-		$(use_enable !debug syslog)
-		$(use_enable debug)
-		$(use_enable zlib gznbd)
-		$(use_with gnutls)
-		$(use_with netlink libnl)
-	)
-	econf "${myeconfargs[@]}"
-}
diff --git a/sys-block/nbd/nbd-3.21-r1.ebuild b/sys-block/nbd/nbd-3.21-r1.ebuild
index 732367ad8970..8e28515c51fc 100644
--- a/sys-block/nbd/nbd-3.21-r1.ebuild
+++ b/sys-block/nbd/nbd-3.21-r1.ebuild
@@ -12,7 +12,7 @@ if [[ "${PV}" = 9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/NetworkBlockDevice/nbd.git"
 else
 	SRC_URI="mirror://sourceforge/nbd/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~sparc x86"
 fi
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-block/open-iscsi/Manifest b/sys-block/open-iscsi/Manifest
index 0ed60bc649ef..2cf7963aa5ca 100644
--- a/sys-block/open-iscsi/Manifest
+++ b/sys-block/open-iscsi/Manifest
@@ -11,7 +11,7 @@ AUX open-iscsi-2.1.1-Makefiles.patch 2185 BLAKE2B ab4dc518f12f0975cf472c94dfa883
 DIST open-iscsi-2.0.875.tar.gz 635121 BLAKE2B 34a7083087c53ed0e59d293d26efe166b09c5ea18b6022869cc9ff3d2edb2fb8b69e2c1ce6c9011bd20fc590b02dafd6d7c13d8bfa1eae6408c4bace13992e5e SHA512 1709011d7d12d3dd9278a0d775af064d5f7da37357f35d6d5c5b3aa8ec16385c28b201b1261f4581dbbbbca3d815015ed8696e1694aa19f3231132f90d1e5b36
 DIST open-iscsi-2.1.3.tar.gz 619746 BLAKE2B 884e24ae6e16578f3cbd8ccea2557e820d4bf4d20c7f88890100ca93f48df88dc7284cc4eca19d93187516fd21a2c5b71eb53f0d8fe395d2ce42fd202dc355d6 SHA512 0de417dc45b765458c5a1f09029b5df9b5c18d45d7a8fb6b38d539b7013f512a3c8731d5046f554611eccc77b93fea0df30fe4932d79cea44776ac944c398a52
 DIST open-iscsi-2.1.4.tar.gz 621247 BLAKE2B 043a999b2f397a6c740d61654079d7ab966caee6cf6cfb244ddd70eae4f5201045b371ce5fbe244216a2a210a5379c92e8c3fbe62d33707cf05e7a4a20a13a91 SHA512 ae0663a964d86e6a4c19203598b859173c93ecce550f9bc9855ff735dd51a3c45822f2bc1cc99e6891c56ef1d16c42223803f07a961558fe6e38ead2164faef3
-EBUILD open-iscsi-2.0.875.ebuild 3710 BLAKE2B 19bdadc17ba56edadb5ff18eaf00e08ef71fb4baef0cfaed73355bf09b2c4311f8cb9d99f9220ddcb14bdcbce0a1dc782ef895916f19d06c0fbc1f5297115974 SHA512 dbedc69c799eb9172d7c150102a58b79bfa1a40c5841a05819339c866204503a70f3482701b2faf667f07dcda6c2d4275f4b2c5a6c0f3009755a86d5951f4bf2
-EBUILD open-iscsi-2.1.3.ebuild 3971 BLAKE2B 04dd9d677937f775b07ec0c6cd85e7410908b6f718a2b342f461b1fa081c7f43c915958ef15fc9c421680772540da11540c2418761f42b5683b6831e4b3dc332 SHA512 f372f6ee0273731f6d68492f704fa332729817167fd10be8de0ddf53efaf9185de40324fb3c1fd5f54a1b443330b5444ae27140ea51febcfd24ca13a128a0909
+EBUILD open-iscsi-2.0.875.ebuild 3749 BLAKE2B f87b689602c5f245040ef9f89fbfa8bb8da2e779017d810830e7e85df70aa49abb8db1edcd626303e1f4381ebe258bc6f706e824dd2e16d145ee330057ee83e2 SHA512 17de23c096ee31f142764bc055a9f13116b27ade9519566016273acbae4b4d1e8c703e1a9bf2aa1f70285309e30323555648eba165c20ab3b9676af4bd5f90d3
+EBUILD open-iscsi-2.1.3.ebuild 3966 BLAKE2B bfd38d26723544c6105d314439171d7a57a0a5570764e78aa56d897d7c7bac6cef1e9cbd03a098be2203a68791013800b09f9145e3bfe7f59cfdbb620f66325b SHA512 05557c00940c49ee23fc764be2a7179be2a57a6590c5f51be9079dffca3887697e36574a8c6382f34f5754de484d1b72d89a66ebbf725e6e887a12f3c3bd5fc1
 EBUILD open-iscsi-2.1.4-r1.ebuild 3995 BLAKE2B 23e00f5793c64838e6b41994ccc3917f6dc3d4862f40bba19ff0964dac000d1e84c1760363384a39af09f929b3dbadc235abc69843a91c6844d82300d7939e13 SHA512 06bf03dd81e8b121eaff611d1f3467775def562b5d32a270114262475ea6f0639464048fa7f5a36e2a917f8215c91dab96e78570183f212167da0da86cb980bf
 MISC metadata.xml 458 BLAKE2B 78071dafcae7bfa7045dcc2724e55ffa92b12658356bdc0a7b7f01214a7681c265a986bc7113e9b4f5f73f3a795a11ba88a2040f0e791129cdd89c70c6dfbaf7 SHA512 3a84213f60f1baee774962a70a4f5f2dbd5f8f353e746a88217451d409561613d6656b56ea1e917441dd300a0945441473f1b090b16d40d8887ad5680dc59c01
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 a72a670d11f1..d92237185ef9 100644
--- a/sys-block/open-iscsi/open-iscsi-2.0.875.ebuild
+++ b/sys-block/open-iscsi/open-iscsi-2.0.875.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="debug infiniband +tcp rdma"
 
 DEPEND="sys-block/open-isns:=
@@ -75,6 +75,10 @@ src_prepare() {
 
 src_configure() {
 	use debug && append-cppflags -DDEBUG_TCP -DDEBUG_SCSI
+
+	# bug #643122
+	append-flags -fcommon
+
 	append-lfs-flags
 }
 
diff --git a/sys-block/open-iscsi/open-iscsi-2.1.3.ebuild b/sys-block/open-iscsi/open-iscsi-2.1.3.ebuild
index 923041df6776..2d727f8645e7 100644
--- a/sys-block/open-iscsi/open-iscsi-2.1.3.ebuild
+++ b/sys-block/open-iscsi/open-iscsi-2.1.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/0.2"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="debug infiniband +tcp rdma systemd"
 
 DEPEND="
diff --git a/sys-block/open-isns/Manifest b/sys-block/open-isns/Manifest
index 53366b3ed731..162a8d6c3d61 100644
--- a/sys-block/open-isns/Manifest
+++ b/sys-block/open-isns/Manifest
@@ -1,11 +1,6 @@
-AUX open-isns-0.100-no_Werror.patch 1235 BLAKE2B 4ecc08979a1cd1bacc46608b98419fbc5ef6bb571dc55682e1dd39ac1434bdf6e7972fc6ebd42dd4256e1be929a28a0b5ab76fd66131ff72e8962c2b2a61e1f7 SHA512 4831f745b3c2853f2eb57bc3df84261853d6e20b82c05902a3dc295f234aa81d2e075f18041cbe894d7f855d0d8f8d62c188dd7a19809a7ed48bef091bbc68f1
 AUX open-isns-0.100-respect-AR.patch 539 BLAKE2B f343794fe2bdec792654c9a0ee18bf7b8890a2f05bd80f43140f4bed8d260a3fb1c6a00725b285e17f46d8fedce310aa48f404a56a6a77ae60a530355f47a7bb SHA512 a88ecd07ae28528cc5e9a1bdca1dcc8a5999abb9742c6f0c712fa8eae5fd1f76b01dff9d6f8041a4188eafb8acd376a0054335c66028893e431fe041e0694cf4
-DIST open-isns-0.100.tar.gz 300611 BLAKE2B a40e8d2bd6e5ac8ed8475d3d50ed6256871134547a044a6b51102ad47c66c335f06372b29e5585df4e59ecd7a817e5f2e48c5e944eea31333ab9f45d51040306 SHA512 ccf49ba1c60d46ae49b75424a966abc1f7e104c8ffa13013951a58a8f0ccaa1cf550f24fd2743fcaba1211a0ec8033c5df5249b7a108ae5974d4f1144dd3b169
 DIST open-isns-0.101.tar.gz 301912 BLAKE2B 98c9c36640ee4d3796538a00e7ab2e4cfb057abc66a56d27ce2eb133d591ea87bcb0e4ffb31b6d72d8e8c806edffb65600c0ae7cd63c61058f36037e3db79214 SHA512 e5a392127b0d85f36e9e4aa963c0c502af8c5aea0aba6d12abb4425649969dcc20ba6e87a99083626d981438439b17b71a86320f816042d82ed5dbe7e7a63e77
 DIST open-isns-0.98.tar.gz 278410 BLAKE2B f90df85de4d5fd2abdcd267e3c873dff62fcac523ee280e21def057eca366bbba21c2b3bfbf5cc0798b8d0f3b0d5028ebb49000cccc850abdfb85142a7b66c34 SHA512 04263b9ace9d272f4e3776c4e1a034815475590d4b4864217a6200fcd5baea391cd788723db3c17fe0d764efc9769a70a3d2167b00e5998fb4bcb8d5fe2547ed
-DIST open-isns-0.99.tar.gz 282831 BLAKE2B 7140daf08fda894bcbed3e25b122909ad0ed86b4f3db2e42a23b97480dea554194d2a33a3ebdf4e2017a57c2023dd8589f2e2fcfa60470cc3a6a3fbfb0d0ccbc SHA512 90a2297535c5e939f83c761173ce5f5f88e68adc31e41e833b23d07b6dc6959572ae7184db0084b861918199a877b251ebae4b4a7456fdd8c93400dc8457adc9
-EBUILD open-isns-0.100.ebuild 1144 BLAKE2B c8592e1f6d767fae9756f51473d5966d0988002b3f5fa22f46b053452e031de749d7467c4b9f320aae24146363b9cd0e814f54114f52eba4596e1f4ea5f69d17 SHA512 955e10101807666d194151e3ba2147f531c6d1b474093d489e44334e4cfbda93ba5dbb7829f616290544dc61c3438307fafe3afcd52831edb9f2b686cc12fd39
 EBUILD open-isns-0.101.ebuild 1076 BLAKE2B a6af812d00e2918c214246b14891d4d85edb2a0d7626a235489391a1e369c68413ebb2dde028e13b01680d91556a9d80a58fb4bca5302aef44805b0c51dde69d SHA512 e9e5f7237b2b24480f1f60f77ec1516c577ed88cd66b1fdbdfb258c8d5d97e38285b9ab6bd49453bf1198576e8d064f240ce48c0b69c38270da56637f69136c4
 EBUILD open-isns-0.98.ebuild 806 BLAKE2B 24c75b271c6604021020d671a5df0ce0767339757a74e8ecd60115b79c06fd0678dd81722a0b17cb987896d5c3766b5ead98e84b69c4f533c734b91c9df26dbe SHA512 aaa566ef607a1bf689e990d2809d70a9600497ae81f0781949ffd98c36999896d8b1e5a27adcc51e46e38ab2c5df01d3d95c259378ee5ad44c17958e1dbdb8ee
-EBUILD open-isns-0.99.ebuild 964 BLAKE2B a04c57b02cca53049460f7c2158fbd291b84dbff31303d4a65d6430eced23330e144414c8368ad99b5369c895d8729ae7d3031743910d33e7867d6de6f9f3f28 SHA512 b7d05a8e14c5bd1164c03845f4094afa98f01897d600d8a5c65ef70548bcc3da06732f1d3e4159823fc1ebe47108d85455c9861b95bfe8d8103b69e081580ac8
 MISC metadata.xml 342 BLAKE2B 3ecae5f098564e59660a3e1de7a3b6ee2dcb7cd2d7ad2acc37e61680910e1fbd5edd2540e20783ca642440bc947cdb40feb6a84e434aba123346f48c6ee48265 SHA512 02d015cd6497b76f48eea880b745556f1a433db2893b91ef8254cf40a1bda2209feb42c01ff29dd6e4a3fdf588a8905076952e838b89a29ab99ccfc39927940a
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
deleted file mode 100644
index 2d966dd3a4fd..000000000000
--- a/sys-block/open-isns/files/open-isns-0.100-no_Werror.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-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/open-isns-0.100.ebuild b/sys-block/open-isns/open-isns-0.100.ebuild
deleted file mode 100644
index fa1351cf05c8..000000000000
--- a/sys-block/open-isns/open-isns-0.100.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic
-
-DESCRIPTION="iSNS server and client for Linux"
-HOMEPAGE="https://github.com/open-iscsi/open-isns"
-SRC_URI="https://github.com/open-iscsi/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug ssl static"
-
-DEPEND="
-	ssl? (
-		dev-libs/openssl:0=
-	)
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.100-respect-AR.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
-	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.99.ebuild b/sys-block/open-isns/open-isns-0.99.ebuild
deleted file mode 100644
index e7290c1b77b5..000000000000
--- a/sys-block/open-isns/open-isns-0.99.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic
-
-DESCRIPTION="iSNS server and client for Linux"
-HOMEPAGE="https://github.com/open-iscsi/open-isns"
-SRC_URI="https://github.com/open-iscsi/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug slp ssl static"
-
-DEPEND="
-	ssl? (
-		dev-libs/openssl:0=
-	)
-	slp? ( net-libs/openslp )"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	use debug && append-cppflags -DDEBUG_TCP -DDEBUG_SCSI
-	append-lfs-flags
-	local myeconfargs=(
-		 $(use_with 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/partitionmanager/Manifest b/sys-block/partitionmanager/Manifest
index 6dcea44813f9..d769119bf1d5 100644
--- a/sys-block/partitionmanager/Manifest
+++ b/sys-block/partitionmanager/Manifest
@@ -1,5 +1,5 @@
 DIST partitionmanager-20.12.3.tar.xz 2085060 BLAKE2B b6f94220f157e33d287f967d0ed568b07622cdbedda82e2659257b92487a40cc8519922f62c705b9eefca5404c0f43b6b331679fd4b18fb5957bbc850417c296 SHA512 480f706b3c1fd7fcd3df49bf9f2277a4337ca696e912664fa9283110be2575b84694b1145d02bf9c4c968ea1be1864c01125e9fe3892d910b898a4afb2aac130
-DIST partitionmanager-21.04.0.tar.xz 2089644 BLAKE2B 73992b063f32f54c465eb137b9229a329f8cb7fe0db208fe506ccec0b6488e4c8684c6d63dbb9e8ab18762ee4e344ae44bd19782b21b67090a4d84e7ce693430 SHA512 045596b2106fd52c1319b5983794055d6d3297943f1f82b7ca07cf08391cf08e870addec5241838a760875a5a4f6687e3512546267c90abc32205056da15a9c4
-EBUILD partitionmanager-20.12.3.ebuild 943 BLAKE2B 44916533d01873f565c5e77c1fe2b70531bec0d82991411422646cf5ab039914180a68d4cc62d75bc12a870b31652766085848eb5139e90f9f9d7d148560bcc8 SHA512 8b7b452e0dd3700223018ab6036cdc5ecfd37ff8e49db38d237f4b2674034117616f79adf8e9a05d4ccd6a3ae4748453aabab8a4faa0abc8ed1c9486e83143f9
-EBUILD partitionmanager-21.04.0.ebuild 935 BLAKE2B 188dedc246bdfefe6ad7528c2fa5fec32043425d213b21accf6e47209c41975a01abc38ce4bc89087b02a80a84de323ebf7b95da05c2bf9d835686b5d53d8150 SHA512 77a1ffd5c157599a1a11d0e13a39b014c7e6ed3982e2ffa48f1e94f42810b37ed89016ec48c832a04e2b1ba5fbe9dfd4613ad85e03729e22e302d435985c3c5d
+DIST partitionmanager-21.04.1.tar.xz 2089836 BLAKE2B 9e8c8160fd954080f314dd0843e2fdbdf3ab6f53cdfbfbe030c489e0db98efffa90710f53c7fc7282d1cfc1ebd244ca506b3742fdc23353d8fc203b73370d454 SHA512 d69903e7f8d059cce4b34834508be329483a4436c5eeb69b0bbbc095d0f0b0d6d7aa01903a9764caf45415729b621f6c3403660fe06cc2c5f9954cfe4a6afb42
+EBUILD partitionmanager-20.12.3.ebuild 941 BLAKE2B ffa89f5fcebe8b912f97b879fb36d1e7998660366b9b19a81dd7cc860e51419a532b0415be587d090af24d02aad8d5b32c98e159001fec2d32873806d284d7a0 SHA512 eebc080000ac20184cfa03e78c7be88d14e3a701e8cdd1f85eb50ebc67192628408c2f79d23e0facb4488064bfd7be62393a6bf03e97a98e7045a3d18ac544d9
+EBUILD partitionmanager-21.04.1.ebuild 933 BLAKE2B 875a518c404bf5ff689394cdf27b42dc55f6fb76578232f9f59a11654e680aa26aeec85c265174302e237cf855d433e9359db5898f3ec78609927775376c410e SHA512 656821a719b0f638437414b6e62a4b7e8d9233392ace32ece4fea3a075a0ff2a9cef1614977e6e16baa4ef317bf7bf2985dad467c65086ce89b758b51d1c8606
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/sys-block/partitionmanager/partitionmanager-20.12.3.ebuild b/sys-block/partitionmanager/partitionmanager-20.12.3.ebuild
index 36e9eee56657..a799f4f9264b 100644
--- a/sys-block/partitionmanager/partitionmanager-20.12.3.ebuild
+++ b/sys-block/partitionmanager/partitionmanager-20.12.3.ebuild
@@ -11,7 +11,7 @@ QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Utility for management of disks, partitions and file systems"
-HOMEPAGE="https://apps.kde.org/en/partitionmanager"
+HOMEPAGE="https://apps.kde.org/partitionmanager/"
 
 LICENSE="GPL-3"
 SLOT="5"
diff --git a/sys-block/partitionmanager/partitionmanager-21.04.0.ebuild b/sys-block/partitionmanager/partitionmanager-21.04.1.ebuild
index c7ab3df55712..c53fb9a3e278 100644
--- a/sys-block/partitionmanager/partitionmanager-21.04.0.ebuild
+++ b/sys-block/partitionmanager/partitionmanager-21.04.1.ebuild
@@ -11,7 +11,7 @@ QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Utility for management of disks, partitions and file systems"
-HOMEPAGE="https://apps.kde.org/en/partitionmanager"
+HOMEPAGE="https://apps.kde.org/partitionmanager/"
 
 LICENSE="GPL-3"
 SLOT="5"
diff --git a/sys-block/sedutil/Manifest b/sys-block/sedutil/Manifest
index f6279a5905b9..967de1444cbb 100644
--- a/sys-block/sedutil/Manifest
+++ b/sys-block/sedutil/Manifest
@@ -1,5 +1,3 @@
 DIST sedutil-1.15.1.tar.gz 297551 BLAKE2B 233ce75a75e298cf77b5737ab8a072b615ea1ee6f13936d4bd2c35d26036fe663efd2ccbf23e7bb1506230014e8282f590a8905a1349a2d7f0d8c77848a613e5 SHA512 9708ef307b457fad2f45735b044685ac6731c353af428c49ff0e312190f3bdc521bcfa71a9e1239d9ffe637d18293a99b09b7e001df96494cdce53f5442750f1
-DIST sedutil-1.15.tar.gz 295399 BLAKE2B 28d4a748248d1d1e7409afbe68dc608c037716aa694c2682d766654cc369136aab00a4af84d4abd2cf7bf1e32bf37b1d8eb55d2386a5b0db5b05471f1895ace5 SHA512 f4071d510db8227c7a4e37e1055993436cd8469e584cdb9d2bf507e006570c103b9e19353733f4ba6631226856c9d2aa8817c134febf96750318cffc935707da
-EBUILD sedutil-1.15.1.ebuild 592 BLAKE2B e4ed7248ab398d92eec28e58378d676c32c08e28d348eb25b705080808723114b90577563ef99342bc127e19f4cff794ce15bc0d8b03c2f4803138630f44d18a SHA512 e8ba616cd6c3881db1f34c879c6d86be43e729419511202b458bd44724339f499f372dd666d71361cbe15747d368726494e2478b57e1c9c20d648caf702f0581
-EBUILD sedutil-1.15.ebuild 1027 BLAKE2B b2de8bc78b3c617c528488e0a8f6303bd555c9df142bcc39282403b08037f9dbe84219a66fda15da67f480f245b0f350f7299df1b23187be51f3cd23fcc0ba6b SHA512 4811618ec7ec75894dd67767d162ee5898c67112818ee94f1cc64d1e1b37f1784e6a783a7e88809911ade4a6f6b2cbce49eeebe5378b4fa7597ea7040643eb8a
+EBUILD sedutil-1.15.1.ebuild 568 BLAKE2B 17152c8491cd36b7570d3e61b7281833bd5f87e8ab0cb8d8e29b886e51ea9ecb39f1ccf6909f9825df277dad21a05388ced24862c57dc0db6573bf03028e7616 SHA512 d41fd49f59f100717e9f375d6a34001ae7a4b2998d1aaf2d66f310e520808cb5eef5f1a15aa0c4ab79ea597c364b26cb1cc1ad5c8116de5745437c35ef9b51b1
 MISC metadata.xml 310 BLAKE2B aff6f154421fb59a5c0e9c60b63a681d47c9044d93bfa448e50e08a5e66b5a517d9d407d2cd6e3869724d3563311981de297478c9647d9e75c70cc64490509e1 SHA512 d060f20a44ba11ff4bfcf99aba392a09b7959bab38477f5c1a0f1deaef43c8d69e719c6464d0592943fe4d4f6ec1df883736c822b890bc17973468f8d3efa59f
diff --git a/sys-block/sedutil/sedutil-1.15.1.ebuild b/sys-block/sedutil/sedutil-1.15.1.ebuild
index 46add69f934e..ac1f377a3325 100644
--- a/sys-block/sedutil/sedutil-1.15.1.ebuild
+++ b/sys-block/sedutil/sedutil-1.15.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit autotools toolchain-funcs
+inherit autotools
 
 DESCRIPTION="The Drive Trust Alliance Self Encrypting Drive Utility"
 HOMEPAGE="https://github.com/Drive-Trust-Alliance/sedutil"
@@ -12,7 +12,6 @@ SRC_URI="https://github.com/Drive-Trust-Alliance/${PN}/archive/${PV}.tar.gz -> $
 LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
 
 src_prepare() {
 	default
diff --git a/sys-block/sedutil/sedutil-1.15.ebuild b/sys-block/sedutil/sedutil-1.15.ebuild
deleted file mode 100644
index 058b0ec518c8..000000000000
--- a/sys-block/sedutil/sedutil-1.15.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="The Drive Trust Alliance Self Encrypting Drive Utility"
-HOMEPAGE="https://github.com/Drive-Trust-Alliance/sedutil"
-SRC_URI="https://github.com/Drive-Trust-Alliance/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-src_prepare() {
-	default
-	# https://github.com/Drive-Trust-Alliance/sedutil/pull/49
-	find -name '*.mk' -exec sed -E -i 's: -(Werror|g|O[0-9]?) : :g' {} + || die
-}
-
-src_configure() {
-	case $(tc-arch) in
-		x86)   sedutil_arch="Release_i686" ;;
-		amd64) sedutil_arch="Release_x86_64" ;;
-		*)     die "unsupported architecture" ;;
-	esac
-}
-
-src_compile() {
-	emake \
-		-C "linux/CLI" \
-		V=1 \
-		CONF="${sedutil_arch}" \
-		CC="$(tc-getCC)" \
-		CXX="$(tc-getCXX)" \
-		CFLAGS="${CFLAGS}" \
-		CXXFLAGS="${CXXFLAGS}"
-}
-
-src_install() {
-	dobin "linux/CLI/dist/${sedutil_arch}/GNU-Linux/sedutil-cli"
-	dodoc README.md
-}
diff --git a/sys-block/smp_utils/Manifest b/sys-block/smp_utils/Manifest
index 4f05e0853236..de6032ee5754 100644
--- a/sys-block/smp_utils/Manifest
+++ b/sys-block/smp_utils/Manifest
@@ -1,3 +1,3 @@
 DIST smp_utils-0.99.tar.xz 344292 BLAKE2B 3652a4772ab887c5f29f083f35667630440ebfe564064b791b57f24cb99359d83cb8961b48c64f4bf132a1a67a164aaa05e87a30133176d4979a530ec4050d3d SHA512 6be07fb4948f46aed4499b52fdaba00b2651048c22b429b99c28c1a45cc221324e423e6411f65bd2542c06a0658e19e1798e1633c2a6d7f65cef7990d86ae34c
-EBUILD smp_utils-0.99.ebuild 685 BLAKE2B fc52ca21a840862026a8bc8a661788e19b886c8b8b30c83f31180cc5c360229a7caf79ead3854b4e25704721fc2c94b35adbb23ae7fe2b977d9b8e1b3596462c SHA512 67f0412fa38147389bd579c394f8e44329010d8b1e2af75397143c8a1ff48cef101eba369db27bd9a5b47dec7296edf9ee827d723244b56f5a3358cd7b7d6e92
+EBUILD smp_utils-0.99.ebuild 666 BLAKE2B 9f39121b34935861185e2667ced0e25de51de4cdcb3afd97b9cc5c6dbc930f95d08763fdd92e50ae8bd2711f69a37aca7d7fbaea24bece44bc4a942eef39a5c1 SHA512 699d272d459ee87d6dddbc7d6c345371a40fd21800128ba5bfff1170298171d2460ab41bbf0786fc797570788de97907e8a42dcd65277f4aa594ffb0b4a928d0
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-block/smp_utils/smp_utils-0.99.ebuild b/sys-block/smp_utils/smp_utils-0.99.ebuild
index 8e06ca005192..ca8be23c12ca 100644
--- a/sys-block/smp_utils/smp_utils-0.99.ebuild
+++ b/sys-block/smp_utils/smp_utils-0.99.ebuild
@@ -1,10 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 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}"
diff --git a/sys-block/thin-provisioning-tools/Manifest b/sys-block/thin-provisioning-tools/Manifest
index f397689a0cf0..2e0689ac7a4d 100644
--- a/sys-block/thin-provisioning-tools/Manifest
+++ b/sys-block/thin-provisioning-tools/Manifest
@@ -7,6 +7,6 @@ DIST thin-provisioning-tools-0.9.0.tar.gz 500998 BLAKE2B ac269fb6dfd1baf1572da27
 EBUILD thin-provisioning-tools-0.7.0.ebuild 1288 BLAKE2B 1361f119e7c18515ea6bc034075a8cd4ad5c026b4911906acc6fd2c60906e076be05b918f1552ec92890ae09b3b48be20115ac8f2631896a2e6a96f057fdcb2f SHA512 e1c199e78b0101e3941a9d3917b4d263622001672c7e5051ca60d67932e6c1bed2a1e5cda46a81c529eb802c59b30fa14c09a1cf86dc7bdd57dcef779762b9fc
 EBUILD thin-provisioning-tools-0.7.6.ebuild 1297 BLAKE2B ec8c85608bca92e5eed6d3da57c6724c83104376aaddae5ab91f3548850eb7d32db91f234ab2bfdadfac609d068e34ae8942e405d923bad5d92204d64775c79a SHA512 b0dab6fe64614b808a020e18183b3c92e7603e20529880ba3cc3e26d156b62b05e7f50421d8ef97de1f7130f625dcc25c603f655d87201f84b45c0e0e176561c
 EBUILD thin-provisioning-tools-0.8.5.ebuild 1549 BLAKE2B 06bbfbb1dec6a16af86ce1e183d86f6564237f227cf1a270aab3fd2750f3906f060e60afc34fcd650f8f4e1d474854ac5f6f449c646f4f02163d2dabcbda1366 SHA512 a01f7de103b44acf7388da317b8f00930cece3b2743ca4619fb134b69868ac077fc3a01a70d1530c8e83b1c5b9ae7710e734548e1df8b9d7e73d375e0b3b0ed5
-EBUILD thin-provisioning-tools-0.9.0.ebuild 1522 BLAKE2B 61187386bcf5867145f37f75d15197a97048a7ddd67b0ac3a003e73ccdc470fcaca2faecee39ef5c60ffc6112de3ebf1809476ee2d8aafebcb77f43d3e2d7995 SHA512 980ab74b8c4b3a82c97d1d19a9ce92562e2d3b948b05f49297085b1f5298f5d870bc56c6781f727650cadb1ceb40e581b5acf7297c950182c6852ad98e362cea
+EBUILD thin-provisioning-tools-0.9.0.ebuild 1519 BLAKE2B a8e33907e935326de0325b790def2a48b187b234e6ee7e85706453b6c82f2224879acd7281d7d692622f365c8a8ae69e0d312ee9163d25fe2ed6173047503a95 SHA512 dd496f25a9c496ee5edf56d3e1a7e54d41de664bb5db83eaa81e3782b3b7a664ee5c582ecc4bd5bf8e325aed961ca0f6e78abb82474836e0ecff0bddf7d347f6
 EBUILD thin-provisioning-tools-9999.ebuild 1522 BLAKE2B 61187386bcf5867145f37f75d15197a97048a7ddd67b0ac3a003e73ccdc470fcaca2faecee39ef5c60ffc6112de3ebf1809476ee2d8aafebcb77f43d3e2d7995 SHA512 980ab74b8c4b3a82c97d1d19a9ce92562e2d3b948b05f49297085b1f5298f5d870bc56c6781f727650cadb1ceb40e581b5acf7297c950182c6852ad98e362cea
 MISC metadata.xml 434 BLAKE2B ce8a3b7440aa5f690989729e202c836ff63833f449e5b302dd58db3b43107b698a5480d761310964ba143b665729ca6ab23417df6eda7f13f24df55427cafb7f SHA512 5a7275bd03045f680a2942a7da2685d4ad94ae1995a612e80c9b6fd4ec8530ad536592247d2e1f4162e49469b9c6139f8237de9d80cae9f339b5852042eab22d
diff --git a/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.9.0.ebuild b/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.9.0.ebuild
index e1ecfd446527..be0287e6fa28 100644
--- a/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.9.0.ebuild
+++ b/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.9.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/jthornber/thin-provisioning-tools"
 
 if [[ ${PV} != *9999 ]]; then
 	SRC_URI="https://github.com/jthornber/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 else
 	inherit git-r3
 	EGIT_REPO_URI='https://github.com/jthornber/thin-provisioning-tools.git'