gentoo resync : 28.04.2021

39 files changed, 316 insertions, 113 deletions

diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz
index 47eca7025268..e2ddde3e0173 100644
--- a/sys-block/Manifest.gz
+++ b/sys-block/Manifest.gz
diff --git a/sys-block/aoetools/Manifest b/sys-block/aoetools/Manifest
index 05d8637dd6dd..f84e2f72b19a 100644
--- a/sys-block/aoetools/Manifest
+++ b/sys-block/aoetools/Manifest
@@ -1,6 +1,6 @@
 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 481 BLAKE2B 9900494f6a2c042e01fce74171838c42e891e99633f1ebdfc957983cce84ac1c5517f802e0f16af0ceaf99aaaba6aba9c96eda4089bb711198b4ff0763597c1c SHA512 a8a16a98f96897e660406b308dc68e391a5085710c0fc4560d5057a5620c5c8e97eaeb6705927689a8636a83272c268be19c3d4da917a231eb4672298d1cbb73
+EBUILD aoetools-36.ebuild 478 BLAKE2B 3b8b6a6170c94626920555b8d1b75edc09296d93d5048e3dc4598b3fbfc108153dbe67935fd8c16f1994e5af846ea52d1ddf1ede049a8502bc97b3c2a8153676 SHA512 df3c96fd4a1cefd38e6ad070cdb287990cbdcf971a9632fc43a64f0ead374e43fae227c811e7a04276503b501e5fcbe2030b919a821779474d4f3e10b10deb86
 EBUILD aoetools-37.ebuild 539 BLAKE2B b5579d6fe06d2f668ccc21828e20478ceb9fc49eb2d2f4875078fd7fc80493435c1923bffb99afa52fbd50318301fd25624df2a53d1d9f34ed970fb3618be3ea SHA512 bad708c0022f62195e4e8642e9ac47c2e1777ddc4f2067ef23b2468d3136f4e5206375516700c10c2b2217bd65ebf4c668986173f61e868bfb68d7414deed844
 MISC metadata.xml 328 BLAKE2B b04b8d9c3016fc84883de505bb4b5fa0dd0f97d8a07c1e84995b7b2931f6b356cfb0f59b7665f7a9c63955a3ee7bae5d37379a326eafe20d58840bd236562718 SHA512 5f04425d524c4535b0b3b42a2c310afa42f09649929f08e12bb491ae808f2fb8dbd08e3c153426bdcef328291b9b19feea2c557ef0a2c6e3a98fc69824c11ca5
diff --git a/sys-block/aoetools/aoetools-36.ebuild b/sys-block/aoetools/aoetools-36.ebuild
index 5f88a396479c..4eadabe70a5b 100644
--- a/sys-block/aoetools/aoetools-36.ebuild
+++ b/sys-block/aoetools/aoetools-36.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-inherit eutils toolchain-funcs
+inherit epatch toolchain-funcs
 
 DESCRIPTION="tools for ATA over Ethernet (AoE) network storage protocol"
 HOMEPAGE="http://aoetools.sourceforge.net/"
diff --git a/sys-block/arcconf/Manifest b/sys-block/arcconf/Manifest
index f49595b9bf5b..485195ac2d85 100644
--- a/sys-block/arcconf/Manifest
+++ b/sys-block/arcconf/Manifest
@@ -1,5 +1,5 @@
 DIST arcconf_v2_01_22270.zip 47168976 BLAKE2B 95693a1408e5a4d0d638bbf265f2e1e64247dfec2b1078b56860c5fcd4b13ffa5967bfb9967abfd4b79c788aaeb20759b3a9070a84b083c1653e4868a96ac4cf SHA512 0f91a697c44ea0c0561bec9e432e7d4eba8eb8a2b0255a9867bdb183f81e745aee1dcc2b0017847803dbb27f55cad3e985f4bcd3a202c52f5b557fb724e94d9e
 DIST arcconf_v3_04_23731.zip 95891681 BLAKE2B e2e001ba8c720a98ad26d46006e27597c9819c815d3ec123708261f771e67991cc460e267e7ccca661c5ab061fea5296f1d49b7374a66a8340617654aea525ae SHA512 800f3c0ecd0d3095c34f787a2ce52ee7424de9bd810040b7bee6096cb9cd07464012c383fe63a9dbf9161112f67ab159890fc63960eb436ce2685a5e28d4182f
-EBUILD arcconf-2.01.22270-r1.ebuild 975 BLAKE2B b2cd433799f0cb7342981bfc3f95b2b066e5d5c806d483c10bead00045bad265c1f1fcd755d594da0485b8ff1e99a68f4bb2bde01becbcc961ad4f27a0f5502e SHA512 5d43eedf6dbc6e0fbd52c1bfdd4f8cca1a0611bc325df165007a276def4df0d9fddc875d53a1b8bf514621233e31515016dfed5a7370401b66daf91ffb2aa8f8
+EBUILD arcconf-2.01.22270-r1.ebuild 976 BLAKE2B 32a256f22700c1942507efc92a5952db4bc48e155a9e4e1d0cb8257c1e6ed3f382d0e6266f47d7d798f95c6e7a40cc1ec0b59efd3e0b4ae051a3df84202954c2 SHA512 495ba77e23fe276ab404643559194c71f29e891afab5613da69ecec857d741a21d0410e2a48044fb39da7b5bbb0e2f912c21002d993578aebef9e7b39bf43f8f
 EBUILD arcconf-3.04.23731.ebuild 939 BLAKE2B cb96aee891a6cc168a2425c9ea3114c28dfa0d5646114419bed9d11637823c94adba93885abb1251dea0336cfdb7869d58632e349255db7ff90b5c8ab65b8ea7 SHA512 556311a56a049e1034812fc4e545f255d14337f6255ee271665b25192a2b6aa34a34342e3e8391657b480826d23a11953f2263c97974a998f9bd4bc8285cf708
 MISC metadata.xml 819 BLAKE2B db0209c49563799b6e71389de7f139c9590406e24272bacd67f667fd544d66aedbf0869d4dc09ca1590601ab0f1a5393a618c408d66e3a447854f0f47df5f99a SHA512 a8e9ba3d80eb67f5ece7d1e1ef4dd7c77da021000daad99fdb191ec59aba378421c6a313a43c13560909fa08e1edbb68baeb700c5a8e012be0f60439a12c6182
diff --git a/sys-block/arcconf/arcconf-2.01.22270-r1.ebuild b/sys-block/arcconf/arcconf-2.01.22270-r1.ebuild
index 8739fe4c04e6..10b55f1713e0 100644
--- a/sys-block/arcconf/arcconf-2.01.22270-r1.ebuild
+++ b/sys-block/arcconf/arcconf-2.01.22270-r1.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=7
@@ -15,7 +15,7 @@ LICENSE="Microsemi"
 SLOT="0"
 KEYWORDS="-* amd64 x86"
 
-DEPEND="app-arch/unzip"
+BDEPEND="app-arch/unzip"
 
 RESTRICT="fetch mirror bindist"
 
diff --git a/sys-block/blktrace/Manifest b/sys-block/blktrace/Manifest
index 3a15e5346a5f..e996c285ff40 100644
--- a/sys-block/blktrace/Manifest
+++ b/sys-block/blktrace/Manifest
@@ -4,7 +4,7 @@ AUX blktrace-1.2.0-overlapping-io-stats.patch 1973 BLAKE2B 2ba883a033f24b9c3b70b
 AUX blktrace-1.2.0-parallel-build.patch 2300 BLAKE2B 87ff4b31b845aee1fe8f14a8a6d35d08d386969eee05c07b2e1b3de2fa2f039d49d699228ef01793cee935ecea5517c9603956866ac3f677eafbb153f9b5382f SHA512 fbb2b217b73072e408e1bad7e3b663935cb005c4ee5cf3dbb1d02cc17b55b511f5982e108545159d0968e8b6ec759441953fd127ad0beeb8661d51fcf9ba6ca1
 DIST blktrace-1.1.0.tar.bz2 395445 BLAKE2B 8a19142991527813942e6377baa5de825572196e75ea43606f2ae2db73d9278c8178f104910ecd92593a70fe9c86c36ebd718e09599e88824f5faaddca5bd7cd SHA512 52ed3b66e1ec62c2204d44037d4d13218fd0229ae694493a21f1e83bfc8aeb029edc96b2be83f39cc3e79500abad56cd5a71c8c4e6dd836661777662f3628355
 DIST blktrace-1.2.0.tar.bz2 395193 BLAKE2B 8f8505f27985f0451f75ced0e438a88758482227e83ba8de235986ab3f116cf38d5aec340d1e7ce3dc3aa5a97c0bd4c46265687976e7326a54ea2e7cce4afc82 SHA512 ce82c8010ca5c2868746d8eb7c6a107fc7382c05df949eeff79e612f5b1a98301a5aa5ab39de0766ea1c074f95e378ba985401cbeba9a296e3182da7d7a23b86
-EBUILD blktrace-1.1.0-r1.ebuild 1232 BLAKE2B e2425bc0dcb05ed4612a05c4a8968de4541dac4d0e4960ef4284e4124fa98103f51162d8caad02c343b9236d0f799f94b9672f1fd95b4c7667d51e9d7a69a2c5 SHA512 06cba40ef087126494b8c85d7dbd1dbe67de7463c4242b13ffa5c10a878d98e4fa9af791d3f2e5abc0a4993042c2c3a046d08a5d5e921baf54e3ed840dbae9ec
-EBUILD blktrace-1.1.0.ebuild 1240 BLAKE2B 38497ee86bcd4094ca9cfa1ffb90fb6b0644e18bde330cb2478ae114c5ebe4188d0328510d1e74dc0c7921db15f917e088d337541e6552b2f718f81195b3d807 SHA512 b1c904b9fd7b82259b3e81ca38b57c381e3f052c5af7685fda8c04040448789e4262f12707cc2f6e3c4ecfa27dcc3d6f3dd8d40316da0d773e17cd08b37ec46b
+EBUILD blktrace-1.1.0-r1.ebuild 1225 BLAKE2B cfa2dcb047d08a5040a1f60dfb2f0070966a50275be9c1dd91c9b7d114b9f9d0a6a5e33fc6072075e0acda71be6be6df79c45985bfa3b637d2823cdcb1f780ab SHA512 5e616a2ed9c4faefab6b8e6bd78b87059db726c73286b152a128177f99e10af91caa3111d94bd5039dd02b5dabbe211fada80efca0da4bf03056606807b02b87
+EBUILD blktrace-1.1.0.ebuild 1240 BLAKE2B 0424f0219c8b1c8d64e4b6574358e903c100a00fba19be7f47e61be04e89a56913f87f398c4e2eda34049877a83a397a15c5cbe55a26e5b5829ea0cb7d93fbf6 SHA512 c56e3b597f0fa1d09cd2c7fc4a63fc0fca80a7eeaab34d1d812e984cf1e93f3730b996ee4523fa92e8d0d44017e5af57d6355d7b05e8b7c03fdf7d1ee2e1cfb6
 EBUILD blktrace-1.2.0.ebuild 1370 BLAKE2B 9f79673ec496b7e8a5373af3ee2d53e44c306de91a45d74c11d6c5a92def87ac22cb50294aa1971f914e7c6923cfe5e619b18e3565639e8fb8de8ab777d9055a SHA512 3b48df771890b653872add3533114dead2ba9eac4d1f46aa935ecf6b691a4771da036f57aad4f5b9a5803e5584676d9cf5c889360e340b1e5eed966a47c70acf
 MISC metadata.xml 216 BLAKE2B 20531789dc11e43feee7ec315a0c1c7249fdf73764e29cb7d6db439826e9ff72f24a5cdb8eb7f1ab99bbb41fb6e4226874a1d1fa4185de52598602bb3b0479a3 SHA512 e881b59fe49746eb25ad66c258b41aba501e4eb563129093a3898ea970a20506e7898f7c355cfcf99605234962bf2c77c1309c258b9a2b84ee4302ccb71c9dbd
diff --git a/sys-block/blktrace/blktrace-1.1.0-r1.ebuild b/sys-block/blktrace/blktrace-1.1.0-r1.ebuild
index c9b984686c7b..29c03c431b25 100644
--- a/sys-block/blktrace/blktrace-1.1.0-r1.ebuild
+++ b/sys-block/blktrace/blktrace-1.1.0-r1.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
 
-inherit eutils toolchain-funcs flag-o-matic linux-info
+inherit toolchain-funcs flag-o-matic linux-info
 
 MY_PN="blktrace"
 MY_P="${MY_PN}-${PV}"
diff --git a/sys-block/blktrace/blktrace-1.1.0.ebuild b/sys-block/blktrace/blktrace-1.1.0.ebuild
index ec5213126820..dd119541f90c 100644
--- a/sys-block/blktrace/blktrace-1.1.0.ebuild
+++ b/sys-block/blktrace/blktrace-1.1.0.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=5
 
-inherit eutils toolchain-funcs flag-o-matic linux-info
+inherit epatch toolchain-funcs flag-o-matic linux-info
 
 DESCRIPTION="btrace can show detailed info about what is happening on a block device io queue"
 HOMEPAGE="https://git.kernel.dk/cgit/blktrace/"
diff --git a/sys-block/cec/Manifest b/sys-block/cec/Manifest
index 1a3652f094b1..5628531d9e33 100644
--- a/sys-block/cec/Manifest
+++ b/sys-block/cec/Manifest
@@ -1,4 +1,4 @@
-AUX cec-14-fno-common.patch 915 BLAKE2B 7c27607c44abb9e321c1891d2683ce7a6a8601d01b1d0d4021bb319bf83951193863a071ec46d7d3cac3ff795a17642b4fba455f6eb13c4a91447c736cefc0da SHA512 ea02e6dc3c0d546285a948966ba149e08684df62efea371230bd2e5dd1fbd2eb6969a490fcb6f238bdf934cd9a19da9c343d71d3ae1a392c071f1d140eb02934
+AUX cec-14-fno-common.patch 879 BLAKE2B 81ce3c301c007fe8ae5526e275becc85f12e41fa6f0e33a50ca03786324ee9d8996ac122d097d7c3581a24addc3bafc45ec3bbc07dc8ec1682067a9025442741 SHA512 c36b242e21941b8b639e9ef18f4a3a1e116683ff61f1eb25ec99378a8b22c77b5dfaa9f01a95f88393651e4c1d80e070fe585b4e9b007c16b153aba1f40b4e14
 DIST cec-14.tgz 22654 BLAKE2B 01bf2c301983a5183bcffb3975ffb148b7efd2b7ea945c71654f090b1063ec1502bb4b64885924ef1fcd5798378537182a3b54e64400187fb515a6fc864a539c SHA512 b024c26badc7992c1d2804378119e214923bd7cfbac80de374efd22084595f74752db0edf3b83ac0e258db1847a3b49734958effc3961c9e086e61d5b806782c
 EBUILD cec-14.ebuild 513 BLAKE2B bd45dc6a07308d44228a41a314c8c7b838d713583ebdb024ef280686e5aa24a17f46a0d73d83423cc71594c51d0b55dbde942d1d20c68ea5718a8da717684043 SHA512 93868f0f138f398438a0fee92897e06d7469bd32fb8e8de7d789d62e3f6313f4b376200c7e1b477ae84bfbaf6de7ab85286b2cc0b66f101f198b7a23d69e6429
 MISC metadata.xml 245 BLAKE2B 1b7a6d4a39b54b959230e9f6941be9369471f402c248a481c4cb0e5cd707b3c4b1d4e8b8a80c01ea9a4dafdf5a0406da9e67a40e1e622427dd3a28e106aea76f SHA512 ed2e6dddb717dffd70eb6a115254a3743c1fc04be9166844e94272797800f8d4dfb39f43c693f31385837b948f365f2fa9ab9010c06bd3cc3ac1d06dc4e3078d
diff --git a/sys-block/cec/files/cec-14-fno-common.patch b/sys-block/cec/files/cec-14-fno-common.patch
index e7e3ce022675..194b8a5866cc 100644
--- a/sys-block/cec/files/cec-14-fno-common.patch
+++ b/sys-block/cec/files/cec-14-fno-common.patch
@@ -10,15 +10,13 @@
  struct Pkt {
  	uchar		dst[6];
  	uchar		src[6];
-@@ -76,7 +79,7 @@ extern int errno;
- Shelf	tab[Ntab];
+@@ -77,5 +80,5 @@ extern int errno;
  int	ntab;
  uchar	contag;
 -extern 	int fd;		/* set in netopen */
 +int fd;		/* set in netopen */
  int	shelf;
  Shelf	*connp;
- char 	esc = '';
 --- a/cec.h
 +++ b/cec.h
 @@ -6,8 +6,8 @@ typedef unsigned char uchar;
diff --git a/sys-block/di/Manifest b/sys-block/di/Manifest
index fc03206f2b71..68c6a3e2e85a 100644
--- a/sys-block/di/Manifest
+++ b/sys-block/di/Manifest
@@ -1,8 +1,8 @@
 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.48.tar.gz 222454 BLAKE2B 763e535e4e57c3805758dea8f7f05e75ff3d2acf9926619b8d45619bcef6157e9bd1b91a647efcee1728dbf2593ce91b934f77f24bb004d3ef546ad58e8434ee SHA512 942e71b7afbf2a4d3ef56cc2844bfbbe1a2001eee750b99951743f43b05c7bf692a59586f9efc228321ea3f91265211d71a4acc2e49e61efd15bcbaf41f98eb6
 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.48.ebuild 700 BLAKE2B 933be4b8f39dd46623cc6240e9898352446b096f895fd3d946c4b1678c338874ff0897da9f54abeeb16faa5771b610de532e10caff09f8871d93510b644c2ebd SHA512 6db6ca87d319e035c9bcc6142335184ac7c75e9218ba11e7ba994252103c0c8018eaea9f0d91a5cb434cad9a97fe56ff7b91acd6a24aeb6c1d33f2c98471bdc3
 EBUILD di-4.49.ebuild 728 BLAKE2B 3d02b92353cad5eaca264dd5fbe6997f746f7da9cfbc4d225b6d93cf592817e668e80d41015154a48db1dadb7a0713c137d27c7f5a469a385865f885017cd410 SHA512 27e107843cd750005ae9bb2e912ee360d2cf2951f40817781fd91f9cfa32869eb703f78cf777797b01f17e545a84d446812d938f3081ced26feb46f29ccc1e33
+EBUILD di-4.50.ebuild 728 BLAKE2B 3d02b92353cad5eaca264dd5fbe6997f746f7da9cfbc4d225b6d93cf592817e668e80d41015154a48db1dadb7a0713c137d27c7f5a469a385865f885017cd410 SHA512 27e107843cd750005ae9bb2e912ee360d2cf2951f40817781fd91f9cfa32869eb703f78cf777797b01f17e545a84d446812d938f3081ced26feb46f29ccc1e33
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-block/di/di-4.48.ebuild b/sys-block/di/di-4.50.ebuild
index 31664c4b2ed8..0b91156a628d 100644
--- a/sys-block/di/di-4.48.ebuild
+++ b/sys-block/di/di-4.50.ebuild
@@ -5,12 +5,12 @@ EAPI=7
 inherit toolchain-funcs
 
 DESCRIPTION="Disk Information Utility"
-HOMEPAGE="https://gentoo.com/di/"
-SRC_URI="https://gentoo.com/di/${P}.tar.gz"
+HOMEPAGE="https://diskinfo-di.sourceforge.io/"
+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/gparted/Manifest b/sys-block/gparted/Manifest
index bb09b845f8d9..0d4838e2fe7a 100644
--- a/sys-block/gparted/Manifest
+++ b/sys-block/gparted/Manifest
@@ -1,3 +1,5 @@
 DIST gparted-1.1.0.tar.gz 4032829 BLAKE2B d47d45e77a3d9dc29e9fa0428aaa7c12bb863cb70ac11f4055cbcc0a0fde8019fbb20266b7f810d6a47c5239248486049c8e9813ead8e88081dd16f445da036a SHA512 afaad690fccbec7385b078a299b78bf4f0f83999e2661f89cb97f9e8f2b30ee41f0535450075e3a7174967e77c75024df78863d0d90d5e8dc726a487b4ae0bae
+DIST gparted-1.2.0.tar.gz 4057490 BLAKE2B 55b03f6bfe99ccccc7394dd64783c89511e48f8c9dd3d64792bb517a27ff5e77fc3be6bbd3ba140efd2ee525cffa4ba8d3136fd947e2d6e45a30f8bcaefb7a89 SHA512 10375ae351805597ec22aa7a7cc13e03bd08c45047c1a48c68194d6129b27f16035d2633d48db0d71923f6b45946ad6a218c17bfac7c38747ed7f908182c5445
 EBUILD gparted-1.1.0.ebuild 2172 BLAKE2B 9b3ca7d93c60746378c1d3c83b2fb74af17a70c43a0e1fd3f8c00a12b58ddc3be80560c785fbda89b99d2a0d0f582dba3a4e6e0f9779c5d6032555cf217e3cf1 SHA512 7fcc0b78d4de2d58a08794dcab6b5b025646ca52e186db9984493131a7f6b158cdb5f3dbfe066d8f7d02b5f1c8d91fc888af8be0ea79b53125b00e252a1c6b65
+EBUILD gparted-1.2.0.ebuild 2673 BLAKE2B f5052c34eb937555932c82febc900f002ab9a9a28806c04d0384df3cebc5cb33598ce0a7ff39ba0ec750ceeb69e8f473203f75e3978de2e4de750f2e93585cf0 SHA512 a8173ed2b47ac231e0320e0e582bc25c5a79cca6c09073b3c497bf68f5694796a1d08e9b72d86c2afabdaaa5276d64aa4bcab44db2edb7ac7fe73045c9ad6622
 MISC metadata.xml 2003 BLAKE2B c1568f7b030ae6d3f0ddc3724424bac3701fd470a535c5cedb8c5fb01f2c7f4f20476075be0033dacaf59bc9797f155c7fecc7ea4ef19ac4545454c275b82010 SHA512 03814c5741c01c342ebaa7b4923253f8efeb7beeb5026866dbc8a28ce1b3c3562c06eff108a15f2365070d389a84fe6d498bde39ed0632a63cf1eef412b3b97b
diff --git a/sys-block/gparted/gparted-1.2.0.ebuild b/sys-block/gparted/gparted-1.2.0.ebuild
new file mode 100644
index 000000000000..2990599fa1ef
--- /dev/null
+++ b/sys-block/gparted/gparted-1.2.0.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome2 optfeature virtualx
+
+DESCRIPTION="Gnome Partition Editor"
+HOMEPAGE="https://gparted.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2+ FDL-1.2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="kde policykit wayland"
+
+DEPEND="
+	!policykit? (
+		kde? ( >=kde-plasma/kde-cli-tools-5.8.6-r1[kdesu] ) )
+	policykit? ( >=sys-auth/polkit-0.102 )
+	>=dev-cpp/glibmm-2.56.1:2
+	>=dev-cpp/gtkmm-3.24:3.0
+	>=dev-libs/glib-2.58.3-r1:2
+	>=sys-block/parted-3.2:=
+	>=dev-libs/libsigc++-2.10.1:2
+"
+RDEPEND="${DEPEND}
+	>=sys-apps/util-linux-2.33.2
+	wayland? ( x11-apps/xhost )
+"
+BDEPEND="
+	app-text/docbook-xml-dtd:4.1.2
+	>=dev-util/intltool-0.51.0-r2
+	dev-util/itstool
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_configure() {
+	gnome2_src_configure \
+		--enable-doc \
+		--enable-online-resize \
+		$(use_enable wayland xhost-root) \
+		GKSUPROG=kdesu \
+		ac_cv_prog_have_scrollkeeper_update=no
+}
+
+src_install() {
+	gnome2_src_install
+
+	local _ddir="${D}"/usr/share/applications
+	local _bdir="${D}"/usr/bin
+
+	if ! use policykit; then
+		if use kde; then
+			cp "${_ddir}"/gparted{,-kde}.desktop || die
+			cp "${_bdir}"/gparted{,-kde} || die
+			sed -i -e '/Exec/ s:gparted:gparted-kde:' "${_ddir}"/gparted-kde.desktop || die
+			echo 'OnlyShowIn=KDE;' >> "${_ddir}"/gparted-kde.desktop || die
+		fi
+	else
+		sed -i -e 's:kdesu::' "${_bdir}"/gparted || die
+	fi
+
+	mv "${ED}"/usr/share/{appdata,metainfo}
+}
+
+src_test() {
+	virtx emake check
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	optfeature_header
+	optfeature "BTRFS support"                   sys-fs/btrfs-progs
+	optfeature "DMRAID support"                  sys-fs/dmraid sys-fs/multipath-tools
+	optfeature "Encrypted device / LUKS support" sys-fs/cryptsetup
+	optfeature "exFAT support"                   sys-fs/exfatprogs
+	optfeature "EXT2/EXT3/EXT4 support"          sys-fs/e2fsprogs
+	optfeature "F2FS support"                    sys-fs/f2fs-tools
+	optfeature "FAT support"                     sys-fs/dosfstools sys-fs/mtools
+	optfeature "HFS support"                     sys-fs/diskdev_cmds sys-fs/hfsutils virtual/udev
+	optfeature "JFS support"                     sys-fs/jfsutils
+	optfeature "MDADM support"                   sys-fs/mdadm
+	optfeature "NTFS support"                    sys-fs/ntfs3g[ntfsprogs]
+	optfeature "Reiser4 support"                 sys-fs/reiser4progs
+	optfeature "ReiserFS support"                sys-fs/reiserfsprogs
+	optfeature "UDF support"                     sys-fs/udftools
+	optfeature "XFS support"                     sys-fs/xfsprogs sys-fs/xfsdump
+}
diff --git a/sys-block/hpssacli/Manifest b/sys-block/hpssacli/Manifest
index 2f875f63b76b..8cb51de8307e 100644
--- a/sys-block/hpssacli/Manifest
+++ b/sys-block/hpssacli/Manifest
@@ -2,6 +2,8 @@ AUX hpssacli-wrapper 534 BLAKE2B 151a434fb5bc2f2168d6d19d117edbf852c0ee8e3e664a7
 DIST hpssacli-2.40-13.0.i386.rpm 11413754 BLAKE2B e6aa28581e08a34bbd77be507d6224090e42458b300e176164794c749c119923da80b9832d589d535bc0a8dc81d4819fe3111393a4e0dfaf7926b396bf75f6ea SHA512 f284c0979141fa2ef8728b2a6c7d7aa8b0e5e61ebb3878439321dd3742223f240f5be9782068da49a58c07ce91615072d9575f22feefb9ff6bb6fac00ae31d75
 DIST hpssacli-2.40-13.0.x86_64.rpm 11772990 BLAKE2B e8d5def139939342183d8edb69902778f53c470af58833a137924e9ba31b277abf40afd96137015dff6d2507bee0e0a6ebb7f39aa7db4f0d6d7aa7f8d7292382 SHA512 4a650c2700f77bdc79693905e56598cbe8f198d4f54c7c97e05a7b8af830f11c5e5eea2d16538a3c6068eadb75159850b391d7f772f59447bbbd870f64eb7efa
 DIST ssacli-3.10-3.0.x86_64.rpm 14202277 BLAKE2B 4697326cbb0d4b89cc68dc8ff44668a7941007398e46e793c1ac785e5d994172d9570af1a2e13328658c2264d0fd9fcc09322dcc9fa92291de8159a9237863c6 SHA512 32df57143f0cdae086569400d3b9f2263aedb536cc81ac794f67c559518f7b9033105f967f15025036b280956149e0ae84f9928c2b6a22b01f5757de7190657b
+DIST ssacli-3.40-3.0.x86_64.rpm 15201025 BLAKE2B a4307ffad4b01f11fea5bf51a27dc8971b46d08afedba5b522b67c43c811ef8f48245e1831f0b9f34cda267d6dd039de33719e53da861bbd60f1a796231aadcf SHA512 372a08098cb4769455e0ced7ebe3e25589353f2feb689fba6234272b79c21fac7e419d559279dedca1e18b7fe0250efb624b0e1b7a8a8ea4720a67701b507d3d
 EBUILD hpssacli-2.40.13.0-r1.ebuild 1813 BLAKE2B 38a6dfaaaf13ad267ee68dbf98e0070f0083dbbd3b7a69b86f68ca7c72409dee5088d913129dae0ada17b3018fa989384553055f491b8684d4a64bbfe965a131 SHA512 ec7c7e0c0118332eff213066a74699d91803317b3a06a1f4d28eebd50d0103dc2baa786747cf9feb901c94ee3e387afcb1680c088be53ef12040467ecadeac5f
 EBUILD hpssacli-3.10.3.0.ebuild 1848 BLAKE2B 0640f0ec506895598ef48c0056cfd867f63026f57d37a39d5d4fe60345ef47f6cebf8eb69f6bc179d116f4b45b029550f8ab9701e8c4443392d9da2888d77702 SHA512 50e3fd826edba186459a7abe747ee6e029a3dc9bd9d115a4db1b849d5b70f288c648aad2b002f7b2203ace11a38b67ac767f18d924207ca6cad231bb0e65c24a
+EBUILD hpssacli-3.40.3.0.ebuild 1824 BLAKE2B 97784741cdcee9cd8228a6f87fce6c25058f727feea5067413482fabf520e116b22cfbe953d7b63185c9247e4fdf6a5bbce7336994f94bc00617e6d22242e7c3 SHA512 0748ef6142865d403851e82852ddbe041386d9900fb7ec73924b66b7a520705bec7a48a0abc510ddaf08b4b34d4f0113e9e0848e93c7bd974a53bf60c7062b0c
 MISC metadata.xml 251 BLAKE2B fb85d245662fa1577cfe1d77526bd34fb2a674dd447192f2defe78b751423e3d14ae73efd3ac0e1e5e6fdb6259622a782e724ec77021faf526509f199dd20d61 SHA512 46942a98ef7e36470d1169a5bc8839d25603e33c143cd36327a8a85fc14cb6bfb32247eb7608d92cc58a06cc8eef5bd64d6ec2d21e69a88632e4b936598aa772
diff --git a/sys-block/hpssacli/hpssacli-3.40.3.0.ebuild b/sys-block/hpssacli/hpssacli-3.40.3.0.ebuild
new file mode 100644
index 000000000000..3295f24d916b
--- /dev/null
+++ b/sys-block/hpssacli/hpssacli-3.40.3.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit pax-utils rpm versionator
+
+MY_PV=$(replace_version_separator 2 '-')
+
+DESCRIPTION="HPE Smart Storage Administrator (HPE SSA) CLI (HPSSACLI, formerly HPACUCLI)"
+HOMEPAGE="https://support.hpe.com/hpsc/swd/public/detail?swItemId=MTX_688838b13b194c7abe1aa98584"
+SRC_URI="https://downloads.linux.hpe.com/SDR/repo/spp/2019.03.0/packages/ssacli-${MY_PV}.x86_64.rpm"
+
+LICENSE="hpe"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+IUSE=""
+
+DEPEND=""
+RDEPEND="
+	elibc_glibc? ( sys-libs/glibc )
+	sys-libs/libunwind
+	sys-process/procps"
+
+DOCS=( license.txt readme.txt )
+
+MY_HPSSACLI_BASEDIR="/opt/hp/hpssacli"
+
+QA_PREBUILT="${MY_HPSSACLI_BASEDIR:1}/hpssa*.bin"
+QA_EXECSTACK="${MY_HPSSACLI_BASEDIR:1}/hpssa*.bin"
+
+src_unpack() {
+	rpm_src_unpack
+
+	mkdir "${S}" || die "Failed to create '${S}'"
+}
+
+src_prepare() {
+	default
+
+	# Create a clean $S
+	mv "${WORKDIR}"/opt/smartstorageadmin/ssacli/bin/ssa* "${S}" || die "Failed to to copy 'ssa*' related files"
+	mv "${S}"/ssacli "${S}"/hpssacli || die "Renaming ssacli failed!"
+	mv "${S}"/ssascripting "${S}"/hpssascripting || die "Renaming ssascripting failed!"
+	mv "${S}"/ssacli.license "${S}"/license.txt || die "Renaming ssacli.license failed!"
+	mv "${S}"/ssacli*.txt "${S}"/readme.txt || die "Renaming ssacli*.txt failed!"
+	rm -r "${WORKDIR}"/opt || die "Failed to cleanup '${WORKDIR}/opt'"
+	rm -r "${WORKDIR}"/usr || die "Failed to cleanup '${WORKDIR}/usr'"
+}
+
+src_install() {
+	newsbin "${FILESDIR}"/"${PN}-wrapper" ${PN}
+	dosym ${PN} /usr/sbin/hpssascripting
+
+	exeinto "${MY_HPSSACLI_BASEDIR}"
+	for bin in "${S}"/hpssa{cli,scripting}; do
+		local basename=$(basename "${bin}")
+		newexe "${bin}" ${basename}.bin
+	done
+
+	dodoc "${DOCS[@]}"
+
+	pax-mark m "${D%/}${HPSSACLI_BASEDIR}"/*.bin
+}
diff --git a/sys-block/mbuffer/Manifest b/sys-block/mbuffer/Manifest
index f3957136925e..518981742c2d 100644
--- a/sys-block/mbuffer/Manifest
+++ b/sys-block/mbuffer/Manifest
@@ -4,7 +4,9 @@ AUX mbuffer-20200929-find-OBJDUMP.patch 279 BLAKE2B f22f74549eb2fba1061141616097
 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 1580 BLAKE2B 7d4d32ea78865d3fe29f94f77e2c2228814b37587bf97ceea6010ef0c99da441bba41344c2b5c4ba38cba7eb64a3e803a5f48ad4785d4bbac858db75fc891352 SHA512 eac277d0ec3650f05087ba0c3e50b15e088eda8c7de182d40334318c44cf54e895c8885bd3a42473cceb31882dbf5ec57f8792ce23c69ca8fe64f18f504dca6d
 EBUILD mbuffer-20200929.ebuild 1582 BLAKE2B b9437a653554366b43dc1bba1b84fdefcfd85873141bdc19416d281b23d720fb14e9003ffbd9310e012903c04aa38d9cbb7c5da4f019777105d90710808b29ae SHA512 7f755da461b9028347feab8d76987d345cc1999dc2519c59bf2bfcd7077f4c2a57fb094be541f13b60722ce0420a7555e5edc63d5e056377c86eb432d522c151
 EBUILD mbuffer-20210209.ebuild 1586 BLAKE2B 2b37d5199d3e4d8dec45677169a8585ef117630f82bf850e32d0f7d90c47726419d0884cc071d34402f2b7f70c741da5af04f4ffce889eb51740e16ba466f0d6 SHA512 41841737e3827d8299733d3d32e880aebf7eeff90a31ae6c66d012a4db4469d47b15a91d366d9a8288d65ff3061db8a246e7eb8cab6974362ada7d21b357990b
+EBUILD mbuffer-20210328.ebuild 1586 BLAKE2B 2b37d5199d3e4d8dec45677169a8585ef117630f82bf850e32d0f7d90c47726419d0884cc071d34402f2b7f70c741da5af04f4ffce889eb51740e16ba466f0d6 SHA512 41841737e3827d8299733d3d32e880aebf7eeff90a31ae6c66d012a4db4469d47b15a91d366d9a8288d65ff3061db8a246e7eb8cab6974362ada7d21b357990b
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-block/mbuffer/mbuffer-20210328.ebuild b/sys-block/mbuffer/mbuffer-20210328.ebuild
new file mode 100644
index 000000000000..715e227db5dc
--- /dev/null
+++ b/sys-block/mbuffer/mbuffer-20210328.ebuild
@@ -0,0 +1,70 @@
+# 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 libressl ssl test"
+
+REQUIRED_USE="test? ( ssl )"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl: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/megarc/Manifest b/sys-block/megarc/Manifest
index 7e8d0f4b542e..1ba6255652be 100644
--- a/sys-block/megarc/Manifest
+++ b/sys-block/megarc/Manifest
@@ -1,4 +1,4 @@
 DIST README_FOR_ut_linux_megarc_1-11-zip.txt 3512 BLAKE2B acaf7d5213b1c13d46a8cca23f5f4ad87d8fa27bf64f61bd57916ff1e0addb0593f53b654a3383e2cb8342c2332b8e55cd5ead5830d157de52b36abef1be1167 SHA512 8ee63fad41875442e158b72a82fafe1ed15e00fd47bed2ff1f4f37f4bd6685eccfcd361294a2694a23c4d53d024d9488d5272ba5352685f346b7722ae7cff694
 DIST ut_linux_megarc_1-11.zip 301703 BLAKE2B e6092fe3e6a58b1d88701801121f2e77b324d3420aa55c824c600917387275f015677c470b7b9e1639777bfed40141e3cb7f5d88f6b08559d2243cb1b657f187 SHA512 9f79ad0c0bb05b9fd9044d66551da0ac95485ddd8ed3a37f1bdb064db80c97897f904150418e93b66783e86bc3ccb2ec1eca9bac7a5dd25bb03cd4414b8389b7
-EBUILD megarc-1.11-r2.ebuild 1771 BLAKE2B a6e6734f917a087f79163161f343b107c646eed63fbc96c942839d35038f9ff107186ca6ef9963f7c1e50544dd1c57390d210bb93fe0971a2a54f05dbafb12ab SHA512 a36e105208d39b7ebb7f99cd00159610560391bc9a17fccf7a499f9c56af085eaa809faa5a27ef5286c049a400b26e8335bd4e86f44845ebb573a7506a7577f9
+EBUILD megarc-1.11-r2.ebuild 1761 BLAKE2B ada506e4bf8fdc5569fd88533736d19373103f3da3d4bef2ac570707e9f75ec1a240cfd6b011f01f476adc8a02bb089a85e2344d4f0e57b28c3072d82157648b SHA512 aa32d600a0cf5f8aaa0489eb6bdbd33a34672c130ca00826bc8f45611a4bfc6076e0e9ecb65bfcc7681cf6b46d5178a80d5c0ba13660c573b216d3e9973d7a08
 MISC metadata.xml 318 BLAKE2B 98c2744d890564a2aee5a9541954654e57d97c3a30ca9d2470afb2d0d63935eadf02d7745b617bb9f0d076bc449ed5f10fbf4610226d3f701077d6e4c3929ab9 SHA512 d2c34bba25ecc086ba1e3e009fbcf56d40efa3522cbc8d1fd4e273a58d21d82c2fd159c25e9295939f713e1ed845d361645915060fef9bc71be9be3d4ef043ee
diff --git a/sys-block/megarc/megarc-1.11-r2.ebuild b/sys-block/megarc/megarc-1.11-r2.ebuild
index 2e0ee390421a..86004d9903f9 100644
--- a/sys-block/megarc/megarc-1.11-r2.ebuild
+++ b/sys-block/megarc/megarc-1.11-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -51,5 +51,5 @@ src_install() {
 	newdoc "${DISTDIR}"/README_FOR_${MY_P}-zip.txt README
 
 	exeinto /opt/bin
-	newexe megarc.bin megarc || die
+	newexe megarc.bin megarc
 }
diff --git a/sys-block/ms-sys/Manifest b/sys-block/ms-sys/Manifest
index 3769e66d97f5..ea25c3de1b38 100644
--- a/sys-block/ms-sys/Manifest
+++ b/sys-block/ms-sys/Manifest
@@ -1,7 +1,5 @@
 DIST ms-sys-2.5.3.tar.gz 76192 BLAKE2B c1046fa346088bb9abd39c8140479e11525fd1965fffebc0ca6ed8da354e354af6946f4bfd2a68ddca1f0b1bbb02ff94216d763a12f4ca43de0cd9ba1aa4d877 SHA512 18080bef903c68b6032e04124f3b3b9f0eb58517b338c6bd795846d786ee0af6b65760166b591090ad865a08a03346675f3c34ce59c64215059dac1439b558d8
-DIST ms-sys-2.6.0.tar.gz 75349 BLAKE2B b3c1cced0c22507c2e8c3a8d0ac9fcaf8fc6d31373b90a77f78a7a9ca7602e88f747e3fd436370ab0b2eb23b2ea964200651f68eccb9807beef1b3f696088739 SHA512 f49790813712b9fd9f63273a7571edbdacb855d93d26dfe1da94d35b656c0ec0574ec43b3cad0f363fa4ec18bd29b81a440d592dc8148b15b18bb8a28c35fbbe
 DIST ms-sys-2.7.0.tar.gz 85195 BLAKE2B ae1b6de38bb4ac275f971c7dfbbdc5d32a645ffc0c32a6fa82f6673fa8788f1a328d9609c2e82812fc74b9c94ea980f257297e67b7fb9536c9d42c0fabc26f8f SHA512 d9828c86a5b316cadcc712ea029bcf7322f89ab31424982fe2a7e23cdb2334a5d076c2b58299f1f312b0d4b4c869a3d7ffadf236230344bc2e7b4a72c668510e
 EBUILD ms-sys-2.5.3.ebuild 671 BLAKE2B e092cb6e2d4ccbe1a36740e5982c442672e7bb39c6a2404f976635d24b76241fa71bc93112afd79d424fec257e1493f2ef9f0f93712cede569f63b41fdde102f SHA512 7fbc604a03ddffd88223b99c1914bd122616f0d66069e0349f75e2c1ade798ae683c1de748bae35c5fb4d3be19e50b17a9bba47a060d4ced6b29f78123e2ee0f
-EBUILD ms-sys-2.6.0.ebuild 778 BLAKE2B 710d5037fbfe0efe43283aedc21f6531242546d4ea2e9ef998f195e273aadbbabaaed365949c6ce5edb738f17730a5b5f08ce12842ab9c83fa4c9074596b8d4e SHA512 36f315adc4234559216df4a4a1f14e9abfe91a2dfb9beff29c67cd80c77addbf9bd49871b7036531368ad0938be4216d1f6edff4d92a2175ca65e68fa5c30127
 EBUILD ms-sys-2.7.0.ebuild 788 BLAKE2B e123725ce7a8efa6bd2ee80f45c3d679cdc43f6a737b386e0ff7792488487ec866b6507624230e0ed46dac919774e9e12e88477f3f0da038d5f5c09e733e975d SHA512 26fe20c0b50e2ec38388dc34f7845b97eed6d038c0a0551df6115abeb0b71ae293293fa990dcad956989813ad18bfd6f214c821b53605d63b29e2eca4d9ca8a6
 MISC metadata.xml 303 BLAKE2B efd83ecd89e4afa7f5254e7fdafcf22883a2293264393af9f20bc1462db09792a97044cb09444331db5fb83f3ee1f9d9fea27fd702a11e7e0732f076f35c966d SHA512 42ef32f756ed48890908bbb142342bfc2b3a1e46c9d8aef7118d0d486d5143d1d43cea0a96f6d0d1ec59bb346d98191032a0f6e12dd0f1f3a1c8930f321b3c56
diff --git a/sys-block/ms-sys/ms-sys-2.6.0.ebuild b/sys-block/ms-sys/ms-sys-2.6.0.ebuild
deleted file mode 100644
index c69a59ec8949..000000000000
--- a/sys-block/ms-sys/ms-sys-2.6.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="A command-line program for writing Microsoft compatible boot records"
-HOMEPAGE="http://ms-sys.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="sys-devel/gettext"
-RDEPEND="virtual/libintl"
-
-src_prepare() {
-	default
-	# don't compress man-pages by default
-	sed '/gzip -f/d' -i Makefile || die
-}
-
-src_compile() {
-	tc-export CC
-	default
-}
-
-src_install() {
-	local nls=""
-	if ! has sv ${LINGUAS-sv} ; then
-		nls='NLS_FILES='
-	fi
-
-	emake DESTDIR="${D}" MANDIR="/usr/share/man" \
-		PREFIX="/usr" ${nls} install
-
-	dodoc CHANGELOG CONTRIBUTORS FAQ README TODO
-}
diff --git a/sys-block/nbd/Manifest b/sys-block/nbd/Manifest
index c295ba322ce2..70e0a58475ab 100644
--- a/sys-block/nbd/Manifest
+++ b/sys-block/nbd/Manifest
@@ -3,6 +3,6 @@ DIST nbd-3.20.tar.xz 535136 BLAKE2B e707ab5565ca2281052d04e0b8854222a14b3dd365a2
 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.ebuild 1309 BLAKE2B 73495cbbfd1fc4c702e855f5a000a2e4727f5da7f52e44468146affaa30cbd7569b04cbeeb9b758c7b809c8b80871debdce7952c5b34c7e68c359785d71e4554 SHA512 2189fa47adaf7c300bd525eebc906512d3c4747571b3548930b1d2fc8a21b8900db247bc9c68ec16e3d1db48af6c773020b836b37757cb584cb86804fda34012
-EBUILD nbd-9999.ebuild 1309 BLAKE2B 26288bdfdb8cda4425f74618119f089bd073ff4cd51b0a2fcdbf7636f4e399cb43117bf30dd9b2fe11f79dd33be5487a061f7804d1b6009c17c3bfd8c50c58bb SHA512 14ecb279342da915ebaedfd8a4ffaa4051f0c528f3852e9c3b9f47421995f81de8d7053b569728f7b0fe9aa2c76c4ccf8797a189b1156166253bb053bf7b33bc
+EBUILD nbd-3.21-r1.ebuild 1391 BLAKE2B 972f386515c90969add5399770d5cdb5eee86f246357ac620d13a24efbd52067d21486d31f8fc15747511afdacb04016581a3f34e77583f3243b4621a182ec81 SHA512 7b85ad69be35850d5cceac88d8c53054c0d330b47313e7e80ab14a43312e0b9b2f299d9d7832f2fe52b688a65fd37efc3173144add13f7df26edc84bfeb03b4c
+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.21.ebuild b/sys-block/nbd/nbd-3.21-r1.ebuild
index 57890d32bc1c..732367ad8970 100644
--- a/sys-block/nbd/nbd-3.21.ebuild
+++ b/sys-block/nbd/nbd-3.21-r1.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=7
 
+inherit systemd
+
 DESCRIPTION="Userland client/server for kernel network block device"
 HOMEPAGE="http://nbd.sourceforge.net/"
 if [[ "${PV}" = 9999 ]] ; then
@@ -58,3 +60,8 @@ src_configure() {
 	)
 	econf "${myeconfargs[@]}"
 }
+
+src_install() {
+	default
+	systemd_dounit systemd/nbd@.service
+}
diff --git a/sys-block/nbd/nbd-9999.ebuild b/sys-block/nbd/nbd-9999.ebuild
index fad2a1deedee..732367ad8970 100644
--- a/sys-block/nbd/nbd-9999.ebuild
+++ b/sys-block/nbd/nbd-9999.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
+inherit systemd
+
 DESCRIPTION="Userland client/server for kernel network block device"
 HOMEPAGE="http://nbd.sourceforge.net/"
 if [[ "${PV}" = 9999 ]] ; then
@@ -58,3 +60,8 @@ src_configure() {
 	)
 	econf "${myeconfargs[@]}"
 }
+
+src_install() {
+	default
+	systemd_dounit systemd/nbd@.service
+}
diff --git a/sys-block/open-iscsi/Manifest b/sys-block/open-iscsi/Manifest
index 450ee4c7b3c1..85e723287d58 100644
--- a/sys-block/open-iscsi/Manifest
+++ b/sys-block/open-iscsi/Manifest
@@ -14,7 +14,7 @@ DIST open-iscsi-2.0-873.tar.gz 667069 BLAKE2B edb427f8483c31499cdde644bbf8d65895
 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.873-r1.ebuild 2545 BLAKE2B c6b89937392718933e75616429acab05e7be548457b9aadaa1be77863dc8ed66e3acbaf482a320479b9c7f73507425615af86839209e2e956e08a12061097a41 SHA512 11de4116925ebe35a63ee19bb49a87bccff3c2648f3ea94ea05726d48cb0fe950a3aae9420b697c51f9f1387cea9075dfbffbeae7ca20af1e411769c34610339
+EBUILD open-iscsi-2.0.873-r1.ebuild 2542 BLAKE2B 3bad7daf68d479e7d458fa57ebc997c2027e4852f475e5bb5435c42b339c9c8268104b975f1b1e3383ac8b511230d84e75ca2481aba878429ab9ba6f1616af89 SHA512 a057f4a49b1e8e38ce20177520eac1f6e0e36200019bfd2ae4d019c1e2075a5420367596c756343508979d383be0410636d1ac768485acdba5e37ecdbae6f75f
 EBUILD open-iscsi-2.0.875.ebuild 3710 BLAKE2B 19bdadc17ba56edadb5ff18eaf00e08ef71fb4baef0cfaed73355bf09b2c4311f8cb9d99f9220ddcb14bdcbce0a1dc782ef895916f19d06c0fbc1f5297115974 SHA512 dbedc69c799eb9172d7c150102a58b79bfa1a40c5841a05819339c866204503a70f3482701b2faf667f07dcda6c2d4275f4b2c5a6c0f3009755a86d5951f4bf2
 EBUILD open-iscsi-2.1.3.ebuild 4031 BLAKE2B 9326eae6ab5b87246c57c8d22eb8eb405067a788aaa770fd2dd9ebc0b6e8ffab649ec93fc3de2739357f261a2bf1368a3691b420a4b9defa4017602f7422d85e SHA512 bb812652153d0f2df9b3ade204b28373d55b9490bb06d5793d2b53b2ff31e2bd3ea677761ddc13a73e5efcacf181f2371c1e6be0d623daa3d3567afe86511c03
 EBUILD open-iscsi-2.1.4-r1.ebuild 4055 BLAKE2B c2f93f6e5fd37d4a539f14f4f47f01ac1d36bb885388a7563d699a26aa82f7eeba1c3a601d19cb1f1fb920ca398bdf76a189c9d310fc07882c7f112bb9d23de3 SHA512 49fb0acc1ebe9ff0b8a56e39d18edcf41976011275a79ded8801285922358b932cfc13930237632a4ba99c501d3a2a0c96a3d6aa1767c01dde8b691078b4aa77
diff --git a/sys-block/open-iscsi/open-iscsi-2.0.873-r1.ebuild b/sys-block/open-iscsi/open-iscsi-2.0.873-r1.ebuild
index f69cf9616609..18707375b859 100644
--- a/sys-block/open-iscsi/open-iscsi-2.0.873-r1.ebuild
+++ b/sys-block/open-iscsi/open-iscsi-2.0.873-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-inherit versionator linux-info eutils flag-o-matic toolchain-funcs udev
+inherit versionator linux-info epatch flag-o-matic toolchain-funcs udev
 
 MY_P="${PN}-$(replace_version_separator 2 "-")"
 
diff --git a/sys-block/partitionmanager/Manifest b/sys-block/partitionmanager/Manifest
index 3033d1095a72..6dcea44813f9 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-4.2.0.tar.xz 1936268 BLAKE2B ae4ea19d2534384e6929526ee0258e528e8cb5e128acf454eaee9f7b4ae6b2485847f496190bea1c41e0f34e45fa0915fda0476cd2a4b9a7686e649554f7ed84 SHA512 bbc4706d078cec9abb0fa89453aecc5ab77c3eba143b5518372772c1cdd823e0a0846a807c5a01c19f5e6a5d44dcd7bc7b9cd1c2375f3f56bb7114bc659e66a4
-EBUILD partitionmanager-20.12.3.ebuild 946 BLAKE2B 78dae6caff1c297f009cae860a9882042f097c733e91a474879c8c7815c59a9051b4098fcc3d72f4fab0308d46d4d286feb63b5386ae2a907caf16b0acd79afe SHA512 d40a378862dabeca6b0fc6284f4b1b4f6ace237f12169e4b85cc63f6ecc3d79cc754933578f49d98e909e8ccfd5cfbae8fc4e246ad1e5906e798e13e40a24e60
-EBUILD partitionmanager-4.2.0.ebuild 1001 BLAKE2B 5693668b4711fafc722742c297f96a77d536668389e4d6feb40d2b5516634b8d316dad3607e9e83b9a366dc8b560fda943db7fa657bfd139fc8b9731dd569529 SHA512 2392a8737c008abc2b60c18fd895cb1866a31815fb3cdeb02d853ce0f90af67eff9eaea386a2aba91a908f2bfbfb48564afb84b73590302ff1680ac35f87d509
+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
 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 1f22f44491d9..36e9eee56657 100644
--- a/sys-block/partitionmanager/partitionmanager-20.12.3.ebuild
+++ b/sys-block/partitionmanager/partitionmanager-20.12.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/en/partitionmanager"
 
 LICENSE="GPL-3"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/sys-block/partitionmanager/partitionmanager-4.2.0.ebuild b/sys-block/partitionmanager/partitionmanager-21.04.0.ebuild
index 3220dc95f3c2..c7ab3df55712 100644
--- a/sys-block/partitionmanager/partitionmanager-4.2.0.ebuild
+++ b/sys-block/partitionmanager/partitionmanager-21.04.0.ebuild
@@ -1,23 +1,21 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 ECM_HANDBOOK="optional"
-KFMIN=5.74.0
-QTMIN=5.14.2
+KDE_GEAR="true"
+KFMIN=5.80.0
+PVCUT=$(ver_cut 1-3)
+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"
 
-if [[ ${KDE_BUILD_TYPE} == release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-fi
-
 LICENSE="GPL-3"
 SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 DEPEND="
@@ -33,6 +31,6 @@ DEPEND="
 	>=kde-frameworks/kjobwidgets-${KFMIN}:5
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=sys-libs/kpmcore-4.2.0:5=
+	>=sys-libs/kpmcore-${PVCUT}:5=
 "
 RDEPEND="${DEPEND}"
diff --git a/sys-block/raid-check/Manifest b/sys-block/raid-check/Manifest
index 7d7ac0024ffd..0fd18b2af7e0 100644
--- a/sys-block/raid-check/Manifest
+++ b/sys-block/raid-check/Manifest
@@ -1,5 +1,5 @@
 AUX raid-check-20140719-makefile.patch 1451 BLAKE2B dbd8b448a59dcc67564c021e675d3cd7f527e0349a37d3fd319afa711e4b78abc94cb45bc9675161df848a1d2374410ed51c189b416e448e186badb40bacb59a SHA512 50ef4c4eafae33a0479d06cd162b54bd89c3ce89b92fb48aa286f9f1fb322ecb6c58c58d29ddbe1b7a42813a2a1fdd6ae4f65242215205eab5acbb0e9d9c9ed5
 AUX raid-check-20140719-path.patch 293 BLAKE2B b678612376f89f896ddd6949c00caa08b5bbaae0aed861375704fd335e2113f091e15d2ed521a407afdf3864cf67af149ee7cedd53b9aa548a6cb546ee5fdfac SHA512 7b9939b9ac05d6c04af5a1422713a316ac18826b7d6f9ed1d5b66e4d557e0069f91e4e04e627a827070c676a845af53eeb2ef7be8bc15455229117727bd4e1e2
 DIST raid-check-20140719.tar.xz 4000 BLAKE2B d9ece0d24d0d32fa68debb7960b74d95f90acc556fdbdd2802597b738cf88e7e993c8d410e9f6b5474484c441b8da3653b4953de9cea8f84a48d2693fc6aac93 SHA512 dc7b4c6e784b3ef2ca89e9dac0bbe3e47056439dfe48615b79922b47cb3b0df7f157ae52ab9de0b9abf5373bd769090088fc8712b492b0aa5327aeaeaee52edb
-EBUILD raid-check-20140719-r1.ebuild 565 BLAKE2B d5d43b986ec3bc63d711b996b09e24385738fdee5dd418706681e0ea7d552eb4563f0cd5fb661bfbbc4720e5b94e75271fdc279eed2853e6e3ce88f3d5b50656 SHA512 19ec1641b943732a75beac267a426dd0e4425e33c5f2ac5c6d914fddd0d65c4f570e714f381eb0cdf5f193af023ae23c0e2012b324bf03b0e45147be6785f7ee
+EBUILD raid-check-20140719-r1.ebuild 562 BLAKE2B ac095069cc3b89d4146553b33a6ddda218c53845f8d512a72fe9e38390c25efc9829b1fd2ea13694516e2169f30114ee1ad2c2f9b1b8452556cbdd607b8036a3 SHA512 7d0b3b65261f65c52198c357e5fe9b0c0b37910ff26b304a188a099abb8b690cd0a3b12759e7bace0306f3cb39790533796d1f155b4247a8ef747d55ffc137ad
 MISC metadata.xml 540 BLAKE2B ec4fcf654a9ccb585438e23c554114699b5722c456ffea12f1e28e0fd653abac61ea0b3ff39d2cf700c2693ce07316b95f6e1341fa3899d9e601ccf25bd889e2 SHA512 80b6f214b0e3a8b0a1bb8d60bb5097ca36eaf4d97e1c379b0adbf2d1b26a3e66017780f955d73a2c75c6f3727af87f230a94d3ef854ca58015ea21e3387129cf
diff --git a/sys-block/raid-check/raid-check-20140719-r1.ebuild b/sys-block/raid-check/raid-check-20140719-r1.ebuild
index 1251ad1189b4..a3b409d94e4b 100644
--- a/sys-block/raid-check/raid-check-20140719-r1.ebuild
+++ b/sys-block/raid-check/raid-check-20140719-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-inherit eutils
+inherit epatch
 
 DESCRIPTION="Script to do \"scrubbing\" on software RAID systems"
 HOMEPAGE="https://github.com/fukawi2/raid-check"
diff --git a/sys-block/scsiadd/Manifest b/sys-block/scsiadd/Manifest
index bd17a7f64035..4bb86e61aa6e 100644
--- a/sys-block/scsiadd/Manifest
+++ b/sys-block/scsiadd/Manifest
@@ -1,3 +1,3 @@
 DIST scsiadd-1.97.tar.gz 43574 BLAKE2B 13f0875165f7d5ea2c87e4931d0d09104a971eaa126969ee5274ade5b337d2ba3edd920293ae2cc962fb841c0449523f68b4ce6b467835a1797174fe30b2eaa9 SHA512 16ffd700d09b27d50f2cb04ba913eb6c4e7f40779ff8037ef1bb24cc593ddb4465733006449c903f6b0f31e0fb8c14e043fba70ed98975f8e07751e0316faa7b
-EBUILD scsiadd-1.97-r1.ebuild 1299 BLAKE2B bac52ca0c2e8c7401ec326a81155cf00004d1a95e27c10ef6bb5e05c6d8f8b270ada6e3893d7815ab440fb0ef2799d81e75d1292186bc208e4d106bfe18f32fb SHA512 3fceb5c5c7e93ca98ab1059ef4dc8db6581aa612e81cd9a73bb895b58d1f3a00528ab4cfb61f88346b380a1a89a9025174fa1e3cbc57760992d6adc8ecec7fb2
+EBUILD scsiadd-1.97-r2.ebuild 1333 BLAKE2B 8b45b3bbdc53988fc3b8f8a07c9083372678a34c3e6a017ed656bf8fd0e3840ade1e1fd63c634f77cc466b29a72a7f4f5dcc41c3b4b7dbca53bbfdce7b96e56b SHA512 88d29cb64c853a0dd7ef91e7386cd23bf5b8f5ec495174b85ae56f8445de5decdcb33c7e867f5a3c5c912ebd2173b54622a8a76c2f4d2dff929e0e394dc52f4e
 MISC metadata.xml 374 BLAKE2B 7edbe16375cf5b8401055290ccc1711f8d7b616a13b9c2952fbf45925e0939602c41259b58126fd8bf2ec7b6f1558a54881543033d03a0d2eeba62e41612a4b8 SHA512 a24d00fd29179c54fc61081c35898e7414af891b3b25cbf0d9bbf0a15a8dd030672995488181f48886fa41b28debcf8735c6363300c8658094efbba497648ebb
diff --git a/sys-block/scsiadd/scsiadd-1.97-r1.ebuild b/sys-block/scsiadd/scsiadd-1.97-r2.ebuild
index 718a26b6f7ac..112fdbce9ac4 100644
--- a/sys-block/scsiadd/scsiadd-1.97-r1.ebuild
+++ b/sys-block/scsiadd/scsiadd-1.97-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit user toolchain-funcs flag-o-matic
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="Add and remove SCSI devices from your Linux system during runtime"
 HOMEPAGE="https://llg.cubic.org/tools/"
@@ -14,47 +14,52 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="suid"
 
-pkg_setup() {
-	use suid && enewgroup scsi
-}
+RDEPEND="suid? ( acct-group/scsi )"
+BDEPEND="${RDEPEND}"
 
 src_prepare() {
 	default
-	# remove 'strip' command
-	sed -i -e "s:^\(.*strip.*\):#\1:g" Makefile.in || die
 
-	# convert docs to utf-8
+	# Remove 'strip' command, as portage handles this
+	sed -e "s:^\(.*strip.*\):#\1:g" -i Makefile.in || die
+
+	# Convert docs to UTF-8
 	if [ -x "$(type -p iconv)" ]; then
 		for X in NEWS README; do
-			iconv -f LATIN1 -t UTF8 -o "${X}~" "${X}" && mv -f "${X}~" "${X}" \
+			iconv -f LATIN1 -t UTF8 -o "${X}~" "${X}" \
+				&& mv -f "${X}~" "${X}" \
 				|| rm -f "${X}~" || die
 		done
 	fi
 }
 
 src_compile() {
-	# extra safety for suid
+	# Extra safety for suid
 	append-ldflags -Wl,-z,now
 
-	emake CC="$(tc-getCC)"
+	# Use system compiler
+	tc-export CC
+
+	default
 }
 
 src_install() {
 	dosbin scsiadd
+
 	if use suid; then
 		fowners root:scsi /usr/sbin/scsiadd
-		fperms  4710      /usr/sbin/scsiadd
+		fperms 4710 /usr/sbin/scsiadd
 	fi
-	dodoc NEWS README TODO
+
 	doman scsiadd.8
+
+	einstalldocs
 }
 
 pkg_postinst() {
 	if use suid; then
-		ewarn
 		ewarn "You have chosen to install ${PN} with the binary setuid root. This"
 		ewarn "means that if there any undetected vulnerabilities in the binary,"
 		ewarn "then local users may be able to gain root access on your machine."
-		ewarn
 	fi
 }
diff --git a/sys-block/scsirastools/Manifest b/sys-block/scsirastools/Manifest
index 903227deb559..c95cea7c68ed 100644
--- a/sys-block/scsirastools/Manifest
+++ b/sys-block/scsirastools/Manifest
@@ -2,6 +2,6 @@ AUX scsirastools-1.5.6-glibc-2.10.patch 3881 BLAKE2B b7d299574f359a9066ad01dc9d0
 AUX scsirastools-1.5.7-sysmacros.patch 634 BLAKE2B 5ce1302984c649b5a378bf8af1be1223c606234d337f2c979564d288948029db69b0fea49dc746d58fe26a9ae4f6e14c0c3044c5c8121e816cac012bde31e4b3 SHA512 2339c57d3b50b80bdc17a1177403a109e7d377ecf4231c63e88a34abed5c9cc0336b5495e972077c6a4c32cf517e0c15bd7bf1982204ea1a89e25b4d03d0eac4
 DIST scsirastools-1.5.7.tar.gz 677348 BLAKE2B f94134fc9e4c17d794a77e42143d620fb8096e2cc64e66fa290563921fa625a322f823ba9f88c17547eb5f03e0a6caf14e106e9d0499afd301e6961fead0345c SHA512 399d366216b5f24ef67086b2e5713a259435293219e22166530a6b92a45519b677bd980906691d2166f1fa6b6ee873568b143df32cfed6a5500066ea914b12f2
 DIST scsirastools-1.6.4.tar.gz 659203 BLAKE2B d041d64662d13165baa1f182e765334ff9027325c90ae92557a48d1edbcba8e96376f0bd5fa1a9952557c74f1c0acad52aff415207c114df44459f1ad99f9da2 SHA512 a0331557eb9c535b3bf33a95994d957505873bc1b39ee240846161a79d7e1f7ed494b23678e23931e917014cf7ebb6a0dd81e5f62089db06e03cf138db06a0fa
-EBUILD scsirastools-1.5.7.ebuild 1399 BLAKE2B 7b72d8f2f36b640c320c0f385a929868d57d77fd0ac23308a4fb8aa4603184e9b5856ef27e331e24965829771ff4254fca519a254e78ebffaf7b287dfa06975e SHA512 6423e05258d96b26c03f52857acb33646b59c6e52fe7e67f7b4a37395f454514b8baa073f00032aa1b1e6d0ca64b9e539e47c3e09a38e411f880d54e7f167204
-EBUILD scsirastools-1.6.4.ebuild 1318 BLAKE2B 42b1921cc3626378537403714921dbf0f41237ddf3f8c0f373d0bf0a8332a56b8a33d4371bb33a22c6b92fc8f99cde33f6fd8f65db5ca69a85440b157aefee09 SHA512 b69c45872e85bb973a781389f2b2fab3a3014d361fac366f443916019a114bff8d76db4692357a00d376f75d0593ff04ccc0bb788cead7cea9370dc5792e2639
+EBUILD scsirastools-1.5.7.ebuild 1396 BLAKE2B 53fa2e3c38e0a1976ae1a6c6b8b101cff43e434e1a57d301aef7dc9d82853bdba9dd5b6728ff728dffd492a4f29a083da4ef9c7a9f117a241805f3c6278e4a5d SHA512 e2b05317091d0393c49a4a21f286a963cc78d53f2d9219d8a6aaacbb2d548240905b10aafc3d35bd79ad9a1bd38a503644424d6a20cac158a0ca66af377f77c6
+EBUILD scsirastools-1.6.4.ebuild 1315 BLAKE2B e37811324d59e15dc1f334a914ff9009b19b12d408ccdc3a7eeb039cba38806a7b7e9c3540c07e54d5cf782bda25083ad4abd563d24f21f7d1ab571f85f3bd2e SHA512 47a5ceaacf58bc1ac92370acdb462ac36605327d8a1ce259bf09e4c9c3e9b9ba960f0e211472cde64f097343e164955401e7d8d5ef86a9dd285f95aafabf6df8
 MISC metadata.xml 308 BLAKE2B d665d3bdace3f2188682eb5a475fce26b12ba6178427fe3b5ee1d7dd262c9200ebf53e49bd7d6bb62863522fad78b2544df66bb33e9c52adc572361c19c2a10a SHA512 a3c71ac01e9d03b79330f35c039bd12270f956c68abdd92edbd909ff212389447cb8b51ab69df71ebcc27b047089fd7d34613808699fad95dc6e8a7fe2d86df8
diff --git a/sys-block/scsirastools/scsirastools-1.5.7.ebuild b/sys-block/scsirastools/scsirastools-1.5.7.ebuild
index 4ff75f1eeaaf..935678ed2250 100644
--- a/sys-block/scsirastools/scsirastools-1.5.7.ebuild
+++ b/sys-block/scsirastools/scsirastools-1.5.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
-inherit autotools eutils
+inherit autotools epatch
 
 DESCRIPTION="Serviceability for SCSI Disks and Arrays"
 HOMEPAGE="http://scsirastools.sourceforge.net/"
diff --git a/sys-block/scsirastools/scsirastools-1.6.4.ebuild b/sys-block/scsirastools/scsirastools-1.6.4.ebuild
index 5fe89852ad68..9f2bb3b436b0 100644
--- a/sys-block/scsirastools/scsirastools-1.6.4.ebuild
+++ b/sys-block/scsirastools/scsirastools-1.6.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
-inherit autotools eutils
+inherit autotools epatch
 
 DESCRIPTION="Serviceability for SCSI Disks and Arrays"
 HOMEPAGE="http://scsirastools.sourceforge.net/"
diff --git a/sys-block/thin-provisioning-tools/Manifest b/sys-block/thin-provisioning-tools/Manifest
index f5134fcd8268..f397689a0cf0 100644
--- a/sys-block/thin-provisioning-tools/Manifest
+++ b/sys-block/thin-provisioning-tools/Manifest
@@ -4,7 +4,7 @@ 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.5.tar.gz 305585 BLAKE2B 7e4bde537535db79e97ddab3cba775c89854362dac7da491c040badf5e3546d2e6ac4b8da8462edb59f50a2ecd95fe9c5e3349fca5e9acd588efaaf990617ca4 SHA512 1f9a1b6b9059f0b23ec3a00ddef223599292d447894316525f13b9c1e4f29d0371cb901d199cb503be4342555e016e5e6eb2d6e0e10c44b08e6c9478c573e1d4
 DIST thin-provisioning-tools-0.9.0.tar.gz 500998 BLAKE2B ac269fb6dfd1baf1572da27582ac2cd763b07aaac130a9467d05581e7a0ba1309d7dbf4c6095407111667e57af2e8183318d558ed23853f9c84b9c151c0878d9 SHA512 e1796fb3948847d72ca8247cae58017507c0a847a00201b93668eeb8fbfea4107c4c2affa5c211c149798a89b10474e83d2bd61a5545a668299be97aed591e0f
-EBUILD thin-provisioning-tools-0.7.0.ebuild 1287 BLAKE2B 0b565635eeda6a26bad5fbd6ffffe26f82cfab495d483ed41e6e7e17b6048c4fe98d07e41b5b69cb3482c5a2916f452d32edccb887a7b2bf0758f6b92829f391 SHA512 01323a16fa2e3283fdc7ea7df90e10f9f9320acdcee136d8bb754a2b4c0ea4084980417a78a389dbc1d389a7aeeeebfac482d88c4f1bae1e6ef9d0ae512504d1
+EBUILD thin-provisioning-tools-0.7.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
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 1e994549f378..8e318177d327 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
@@ -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/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 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 )"