gentoo resync : 29.12.2022

author: V3n3RiX <venerix@koprulu.sector> 2022-06-29 12:04:12 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2022-06-29 12:04:12 +0100
commit: 0f558761aa2dee1017b4751e4017205e015a9560 (patch)
tree: 037df795519468a25d9362b4e95cdaeb84eb1cf9 /sys-block
parent: 752d6256e5204b958b0ef7905675a940b5e9172f (diff)
55 files changed, 436 insertions, 602 deletions
diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz
index 76abdb1b2d5f..453f52127659 100644
--- a/sys-block/Manifest.gz
+++ b/sys-block/Manifest.gz
diff --git a/sys-block/di/Manifest b/sys-block/di/Manifest
index 133c11c3e795..7690bbeaef4a 100644
--- a/sys-block/di/Manifest
+++ b/sys-block/di/Manifest
@@ -1,6 +1,4 @@
 AUX di-4.33-build.patch 1041 BLAKE2B 971d2cdcab457ede532c490d2a584ea76d7c7181587e670a18ee51431716e9fa64c1acc89ae41b51fadf58829e3d0edbd34181bd439adc50f028eac49786115f SHA512 5ed513a857585bd460e530d406488729e3b75f9a945faa600de1c41ed30762f2a5ed578ee10c5df16f3980b2063a05648d6c85c2882da8ef40e657e058788214
-DIST di-4.50.tar.gz 229467 BLAKE2B b597f2d16d6d1003711e301fc584ca5a1aee90bfb041d1b198348954864bf1000a0e19ca5dcc2c56683c0ff1bbfa22365b9ca5a26f2d7936374e31d479e4d05d SHA512 6183004c10d121054d310e2e5ef1e96ceffd38012c3b3d80f1ce1f0155269334ae418ce651b74daa261e255b76d1999be6975fbc253ea320a8f6ba410166e312
 DIST di-4.51.tar.gz 229504 BLAKE2B 05906e2cc34b88065ff1f38abaddd2ded00dc20e6ed35b942ac4f75eb7a1c95bf9b2451f0c6a4cd5fc75b6f17e226980dbc8f2b8490247f379371538022906ad SHA512 cc4323f372220f9ca12e53e8deea6f7a2d475c39c5e4951fbd0e9cb2ea6ac1b5b611dafcdbd09658560afdf8948d644c46d582e31d619286a6d01703911ea7dc
-EBUILD di-4.50.ebuild 724 BLAKE2B 43dcdebcd81b1f4776b84ded61adbd3afa7c83b77cde50e0ee7586d7cc40d603b97bafd5b183b181b0f4682b41a0e209fed01be6d8951ff3a37199ab64631421 SHA512 f9b8b879ce3fdf3208f3b24d5ec39e14d1a8754f37505ec784be74d5ea1b53a3d1931d4c35b0d23d10c106db9454396e903b1c20a551d66616b11be39c703c97
-EBUILD di-4.51.ebuild 728 BLAKE2B 3d02b92353cad5eaca264dd5fbe6997f746f7da9cfbc4d225b6d93cf592817e668e80d41015154a48db1dadb7a0713c137d27c7f5a469a385865f885017cd410 SHA512 27e107843cd750005ae9bb2e912ee360d2cf2951f40817781fd91f9cfa32869eb703f78cf777797b01f17e545a84d446812d938f3081ced26feb46f29ccc1e33
+EBUILD di-4.51.ebuild 724 BLAKE2B 385bc17ab9f5b98ca86c444c7ff5d6d66b4492a8edfd5cb81fbc8e0b29b88e4525c68e2a73c374894025cc69e377fd1082f7c3e11c4e28a2fcb4701576732d99 SHA512 19625eddb7733afacb819de9a8a5e0d4b5cc9d3e10c00c7acc4bdb2a26fc4d1beb6a99b13c8ddd67b4abbb3d1a343938879d17809ef7b7c2364fcca9dcf0314d
 MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c
diff --git a/sys-block/di/di-4.50.ebuild b/sys-block/di/di-4.50.ebuild
deleted file mode 100644
index c372aade5cee..000000000000
--- a/sys-block/di/di-4.50.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.51.ebuild b/sys-block/di/di-4.51.ebuild
index 0b91156a628d..afc27b3f6538 100644
--- a/sys-block/di/di-4.51.ebuild
+++ b/sys-block/di/di-4.51.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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/f3/Manifest b/sys-block/f3/Manifest
index 16a7de77eb73..36b7cc1ec7ef 100644
--- a/sys-block/f3/Manifest
+++ b/sys-block/f3/Manifest
@@ -2,4 +2,4 @@ DIST f3-7.2.tar.gz 68471 BLAKE2B fa2e98ee0bdbad117c44bcc866d8ee5ef1572469d0b3cc4
 DIST f3-8.0.tar.gz 71493 BLAKE2B e5c580971b001be0041b7cda2815d3e075b9590dde20f3afc722dc0126b10dfd13f85e4d2c7994210b4bc4746fed2ef400582293cbdf9d3271ca62ba379b4df0 SHA512 4c929eb3ad56ffefff7ae3266148e2000e14f01553c1960ddbe77a164df18dda6f32980140b7568e32a3165f9362e4f43c990a946a62b15b06720d6f8b87f924
 EBUILD f3-7.2.ebuild 1024 BLAKE2B 9a667aeba7406e8c7052e27786c7227cb891e6b8ca50d58eecf889532d1a51e043effc14e92e52a8ae956687c8c76f878fc4c5b18e78290c394f1edbdef33529 SHA512 ce0cb757390b388699f342015da761a51686bcf135dd17abf4f16560daf04d7bf4349fcb307248afa9cd6d7fc4bf2be17d4478a5d437c331b397df6ade2f58af
 EBUILD f3-8.0.ebuild 1132 BLAKE2B 6cf42b66692483cb9fbe00b594e51aba5bade950084d648508d51665332dc34a4033cbbcc9aa182e3054e3c5b19fd9ec3b38b5940afc4d20467ededb375558b0 SHA512 d112f42e55b3f33c7d459a0842ac2097dea3043a173db5ad5ee9ce3701012e9fd1cbba3aa5925cbed081971c534c1e7312231d84a09c73ccca5ada74f003b745
-MISC metadata.xml 960 BLAKE2B 56e2c60deb6e448cf989dbe56b4b01b83bfb5187f3df329e10ba1ac8458b26baba33092e3362365b8e4675e2e1ed336b60c94f83cb035aca9ca535feff28f20c SHA512 a929b143c1ddccc3dcad50298d0a0cc36e9acf6ace8f198e3baf6c4a7da3401b0789badddc74a191bd95957c691bad2147a7c6dc6b2c891d317e783355c41d1b
+MISC metadata.xml 876 BLAKE2B f8cfda7a892bfe6221780f072eabdd89724dfb5752557a157cfd1245dc52262ee03f5c749fd660f7d0ec514d631946c13dcce4153ae3bdcefaa7b7d93193d00c SHA512 d19e16a5d242a33af6a821e33c81f2aab3a361e0cf721915740c3f14d45bfa705d23490d44131d4e28d11e0930a5fbb334b738660b5bbe7a48264a2d5523638c
diff --git a/sys-block/f3/metadata.xml b/sys-block/f3/metadata.xml
index a0dc08db0218..6175c2165aed 100644
--- a/sys-block/f3/metadata.xml
+++ b/sys-block/f3/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>whissi@gentoo.org</email>
-		<name>Thomas Deutschmann</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription lang="en">
 		F3 - an alternative to h2testw
 
diff --git a/sys-block/fio/Manifest b/sys-block/fio/Manifest
index d51bf3423c28..18c8d8eb3810 100644
--- a/sys-block/fio/Manifest
+++ b/sys-block/fio/Manifest
@@ -3,5 +3,5 @@ AUX fio-3.27-drop-raw.patch 3315 BLAKE2B 93cfc730e2feceae2cc20c76b93a4e1da2a6b0c
 DIST fio-3.27.tar.bz2 960330 BLAKE2B 7e7e01a5c1d6af13a6f87139e7738646cbc8f45ebc370d0c45b9efe1f93778613d374daafc6df459f988f27f2be54ff636235e1e5a92a4a6ecf9a60ed573d170 SHA512 9c5f2ab0c9ac24ab78dbc74fb6c5acd60f8189fdc618f4280992141b6c0abe1c235c373fee18ad0c803e7fb25d480f45aec56dc3be2e0d26d181b3418b179f99
 DIST fio-3.30.tar.bz2 6001772 BLAKE2B a4941cd415e6444bb9871274580efdf82281a1e52dc3caaa235f63176e3564fb1dc08e1e4586c555f9c25975d7e6220fe53209ed7218da713b9cb9135de0fc05 SHA512 1fb2ae9c28028147edabceff734fc41bf07ce504af98afdb0951920b724b15d647f2b0852262c177279ad6b4dbbf24be458db7f939d1c80069e0f8e7bc8aa10d
 EBUILD fio-3.27-r3.ebuild 4318 BLAKE2B 0c5e47fe1cb9a9471233f057dceff0dcff8c6bf4826bee3756f2faa5273e36b8fcddf5525779a91f93492127a260dada548cc32992db0709bf10de8827830a15 SHA512 70b244f998c7d4aa0f0b55db5028f855cdeceb9e09467991a08e1e86d94c4f9b1916c44a9c0414b0b4486c719fa5f1b97097e35c0f88251aa7071a63483d5eb5
-EBUILD fio-3.30.ebuild 4404 BLAKE2B 136b43fd9c559c4b3cd3612e92a905f6cf885153c5904938e35ccb836d546c586bb557a05074366a6e6621ab7b65bfafb5df2f8bdf8cbd087914848236ac539f SHA512 c90ae9e5e8ca0214a4fd3a3cf426bdc6b42060078b748b7d4cb04b14dd41d427166d0769e6d5037748f6340b579d489e97fc3b8a963d23c61796f930d45e8639
+EBUILD fio-3.30.ebuild 4411 BLAKE2B 297ccafb737510a4a47a0a19e5375feac491d748f232d5f2f62096f171d7e6c8b115a722b65e54294a22b31e71d5879746378ddd4076947b94661c067e3522ad SHA512 4fee8d102b438432a57b42ff937936966c6271dd577b6c76a4c4b114759c9558d0f20bf21980fcefb9764cd94cf98a2ddf3a149d71ab95a20ad04523b0f27498
 MISC metadata.xml 1219 BLAKE2B 854ede8de3dbf6320886a8ca1e8a54f6d3dd4fe080aab6a49032cfbd0eb99503a00f8719225deea1ebebd0da22eb64fb10dad77daab961fdabd9e6ff5100b122 SHA512 b59158d6ead3b96a8e5818685fc6b9ad3b5172d94c07a0c32f1ed688d8e70caded5a2446108aa8f5923a6de953c52363401e3fb08837c39f4f3d7afaca2c4135
diff --git a/sys-block/fio/fio-3.30.ebuild b/sys-block/fio/fio-3.30.ebuild
index 0eb2039eda6c..c5fa566adf93 100644
--- a/sys-block/fio/fio-3.30.ebuild
+++ b/sys-block/fio/fio-3.30.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://brick.kernel.dk/snaps/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~x86"
 IUSE="aio curl glusterfs gnuplot gtk io-uring nfs numa python rbd rdma static tcmalloc test zbc zlib"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
 	gnuplot? ( python )
diff --git a/sys-block/gparted/Manifest b/sys-block/gparted/Manifest
index dc708c7b9554..a6aed39d2c2b 100644
--- a/sys-block/gparted/Manifest
+++ b/sys-block/gparted/Manifest
@@ -1,6 +1,6 @@
 AUX gparted-1.3.1-musl-nullptr.patch 2446 BLAKE2B a1a0e278edfecaac9de5068d4ff37bd7f8ee7223c46004e64ae7d26ff1e9b463e2064d20ef0e4d15fdd6a0bc00253acabee6102feb604e0016e4f2e558b6ff68 SHA512 386f3e79cd443dcd7db1c9dae2f79b070d254e86a3651b8de2386934f69724651e398e41db1365859060bb0869d35528418cec683173ee4f0d9e39fa430ac81d
-DIST gparted-1.3.1.tar.gz 4169647 BLAKE2B 0e79ea51df79460ae70e15a0f4d5bb1158dd808b52224bdf78f153bada278e6a8cb1606aa99e564016db0b4755e4063e0db151628d8d03904626e9f5648d61a1 SHA512 2dd2b1eae72f627d8f302d34286e684c6b884faf0246f1f534795213d243a9416ff2a7ead48f44958de1ce00248550336176c0df2469ede825b22ed1b5915c76
+AUX gparted-1.4.0-musl-basename.patch 2166 BLAKE2B b7241a431d0df6e8780ce28746356ce8d716fdb2561ea80c424c9bbcac13e262540dca5661fd72cebba539444f51ef54f49a4b18d5d398768367e7b5d6ee2e26 SHA512 1456d8f4dbf253c22e8dbf2ac59865a7b27066ba25d8f31537a822be3faea1976c0e56341aecc322ac9787cb2e3e55242f35d8e7d28203799edfe2cd007e66a4
 DIST gparted-1.4.0.tar.gz 4308426 BLAKE2B 834782196e7cfe5c5553200743cbbaf700e59ef01076919d16138e736ebbbb16185ec68cd27546f1ff851ff742c51fc170a0f6596e9b014684b8be1d29acfea9 SHA512 20f94622fc1a2727f1fc9bb39ea9f04f14af06b0ff7e47c2149730d5eb339089b0d3c21cd3c9ce6f971e955a9f6ab89cc32fd5b7545a5e340b451297d87e8f39
-EBUILD gparted-1.3.1.ebuild 2808 BLAKE2B cc84d49cb77db5bf0b582e3bce8cf280c5cdffd378c7a5ae266930ec6fd1bf69dd2a41bc91bc403decab2638800f9a3dddc97be7e173a3842fe8d864bd063358 SHA512 4f4b19616bcc9e5158114e28a86452f0fd5a7d32dd0eb6144ae6a6b290de4ffcf614f916066df6adf916ad15fede72c0ba5de73ffb5b9715372144922de0e811
-EBUILD gparted-1.4.0.ebuild 2819 BLAKE2B 092bdc7b8c454344176701edb934ff556a40d480a8210f394e2246ba460cce2846fb32f97c3fdddda99f0cebe02dc25310b676bf7809e8c97c06a396d70ed38e SHA512 4fd82d8f29e739fe1b2874dc336b10153bcc8699785dc8441f7ca462b35dbaa9b3bdcc25ae4fab2cd2f9bc4b440d7fcaf81968cc800ce848112cb5470580f5d1
+EBUILD gparted-1.4.0-r1.ebuild 2866 BLAKE2B 406a2dbc84155dfd8ddf5edfa49c89cb7ee09eb51728310f480f277c9cbff23d2e52ce63bb14482bb42779e7c9dd423ec72538576f9f2e93d406348d9c968ebf SHA512 ee2815335403c399e173e976d39b9af84b2b9884325d62a5f9f4acc513f2ea83cf9ef99e04c2f9d638dd988809683a05791ade5a01f97967de2726d511bd7100
+EBUILD gparted-1.4.0.ebuild 2815 BLAKE2B 03acf37610fc4fe3e33c5aaefd2a8f963fca3c0b84d6562a43874f8a8eae4119d2c49278debc1dfbad6b0a5856e5c18bdb1f24bf6389f23985f9c99b8ebe682b SHA512 9568098e125de639f4bab0a155ffedd94678ba49e895d227f375f89552a41124c66f9eff50766789887b9269967ef23d16896c8833ba71e819ab46addae6ffdb
 MISC metadata.xml 915 BLAKE2B 0d1b9e847455a3920c9826b8f352481448aa08b6a7625db5d19da403b5d20dcf4dcc78a9b7a3925fe06915a5078979668028c7c1e8da869a3f9d493fed22d2cb SHA512 7df8fd771da273681728e142d7e6ef10b5434dd40ac96eb2da96c1331116dbc33c7a25be5ca69dd8a56d3eb4ed961d4a51d4f0c554b44e5752169b0f5b9d2e8a
diff --git a/sys-block/gparted/files/gparted-1.4.0-musl-basename.patch b/sys-block/gparted/files/gparted-1.4.0-musl-basename.patch
new file mode 100644
index 000000000000..eeba8867ed42
--- /dev/null
+++ b/sys-block/gparted/files/gparted-1.4.0-musl-basename.patch
@@ -0,0 +1,53 @@
+https://gitlab.gnome.org/GNOME/gparted/-/merge_requests/99.patch
+https://bugs.gentoo.org/837794
+
+From 45c00927b72319f00855c7feaf4dcf109b3e4414 Mon Sep 17 00:00:00 2001
+From: Markus Volk <f_l_k@t-online.de>
+Date: Fri, 8 Apr 2022 08:58:46 +0000
+Subject: [PATCH] Use POSIX basename() in BCache_Info.cc (!99)
+
+Musl libc [1][2] doesn't implement the GNU variant of basename() [3][4],
+obtained via #include <string.h>.  Therefore GParted fails to build on
+such distributions:
+
+   fdebug-prefix-map=TOPDIR/build/tmp/work/cortexa57-yoe-linux-musl/gparted/1.4.0-r0/recipe-sysroot-native=-fvisibility-inlines-hidden  -c -o ../../gparted-1.4.0/src/BCache_Info.cc:52:33:
+
+    error: use of undeclared identifier 'basename'; did you mean 'g_basename'?
+            return "/dev/" + Glib::ustring(basename(buf));
+                                           ^~~~~~~~
+                                           g_basename
+
+Fix by using the POSIX implementation of basename() [5] instead,
+obtained via #include <libgen.h>, which musl libc does implement [6].
+Note that the POSIX implementation of basename() is allowed to modify
+the string passed to it.  This is okay because
+BCache_Info::get_bcache_device() is using a modifiable local character
+buffer.
+
+[1] musl libc
+    https://musl.libc.org/
+[2] Projects using musl
+    https://wiki.musl-libc.org/projects-using-musl.html
+[3] The GNU C Library, 5.10 Finding Tokens in a String
+    https://www.gnu.org/software/libc/manual/html_node/Finding-Tokens-in-a-String.html
+[4] basename(3) - Linux manual page
+    https://man7.org/linux/man-pages/man3/basename.3.html
+[5] POSIX basename()
+    https://pubs.opengroup.org/onlinepubs/009695399/functions/basename.html
+[6] musl source, basename.c
+    http://git.musl-libc.org/cgit/musl/tree/src/misc/basename.c
+
+Closes !99 - Fix undeclared identifier 'basename' build failure with
+             musl libc
+--- a/src/BCache_Info.cc
++++ b/src/BCache_Info.cc
+@@ -17,7 +17,7 @@
+ 
+ #include "BCache_Info.h"
+ 
+-#include <string.h>  // GNU version of basename()
++#include <libgen.h>  // POSIX version of basename()
+ #include <unistd.h>
+ #include <glibmm/ustring.h>
+ #include <glibmm/fileutils.h>
+GitLab
diff --git a/sys-block/gparted/gparted-1.3.1.ebuild b/sys-block/gparted/gparted-1.4.0-r1.ebuild
index 1119005c1bb3..4fa2d910bc99 100644
--- a/sys-block/gparted/gparted-1.3.1.ebuild
+++ b/sys-block/gparted/gparted-1.4.0-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+ FDL-1.2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 IUSE="kde policykit wayland"
 
 DEPEND="
@@ -37,6 +37,7 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.3.1-musl-nullptr.patch
+	"${FILESDIR}"/${PN}-1.4.0-musl-basename.patch
 )
 
 src_configure() {
diff --git a/sys-block/gparted/gparted-1.4.0.ebuild b/sys-block/gparted/gparted-1.4.0.ebuild
index a209f0a714db..f459c427b2ad 100644
--- a/sys-block/gparted/gparted-1.4.0.ebuild
+++ b/sys-block/gparted/gparted-1.4.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+ FDL-1.2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 ~riscv x86"
 IUSE="kde policykit wayland"
 
 DEPEND="
diff --git a/sys-block/hpacucli/Manifest b/sys-block/hpacucli/Manifest
index 955983d92a70..c32fda054c16 100644
--- a/sys-block/hpacucli/Manifest
+++ b/sys-block/hpacucli/Manifest
@@ -2,4 +2,4 @@ AUX hpacucli-wrapper-r1 541 BLAKE2B 102c1957b78ed5a465ec7e6205f5bace8d1f37e03ea1
 DIST hpacucli-9.40-12.0.i386.rpm 6824495 BLAKE2B 48fd1294eac0bc9eeab4479be07ce75c61cd5f846e5eabab04c22d154bc06051961b0094d421915b79b4b37526b15dceb8e015302373f2fb0bcbb37b4e5b045a SHA512 93ae6c170e14e187ce33522a7f7d4e0970f8443758aa76f4eb72c6b818eeeff7720e9869473b62e4b088ced0bb9a198afecf7ff62da2fc73e67208f5cc680158
 DIST hpacucli-9.40-12.0.x86_64.rpm 6800521 BLAKE2B 468ac943ddd477616345d982767bd23552f75d4a906c7e21248a1efa867952cd8929a0449fadb28234032b2d4ad57cf1ef56ae7e0eab9308ee4bb1055b131f0b SHA512 a7de22febc0261bdb60a5fee250d42455dc0ac152541f34eb91df81b4e57472ae96ee2972e3a4c44ff409e3d1c2b364054818c7ea610c3b2a20c913a51df2ed4
 EBUILD hpacucli-9.40.12.0.ebuild 1519 BLAKE2B 9ca3161328ac758e428f305cd59cefa6fe1380337e69af8233885fda07c7613c90fbd19e3a913f13b3b3ea92238c050bc1275d81314cc5f7bfa5984f7b9f6150 SHA512 872f452a28257771ca073c849cfc9e81e1d9b1968fed35be90f59245a04af343379991a25745ab74504e21b5e2b8495dfa9061f29ab3a54d246bf586079e2435
-MISC metadata.xml 252 BLAKE2B 84ce9630af2d663427fcf6fbc9832ea43e936720673088eb4a50db0e894647868f68ff3521824675235ee1ef504e4dc823efbd8d8f0b0905d58d8da94269eb2f SHA512 e44e7852efb83e01ec3ae07e390307b5de89fdd86705bfbc79432807c7b286fd56939ba92f8896c55cd70dae507b5e8ebc9d8e70c7d2756bab84cdc011c42126
+MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/sys-block/hpacucli/metadata.xml b/sys-block/hpacucli/metadata.xml
index 542a8a19f0f6..115e9d64a669 100644
--- a/sys-block/hpacucli/metadata.xml
+++ b/sys-block/hpacucli/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>whissi@gentoo.org</email>
-		<name>Thomas Deutschmann</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/sys-block/hpssacli/Manifest b/sys-block/hpssacli/Manifest
index 10c50dd2c922..325da97b48ad 100644
--- a/sys-block/hpssacli/Manifest
+++ b/sys-block/hpssacli/Manifest
@@ -1,13 +1,11 @@
 AUX hpssacli-wrapper 534 BLAKE2B 151a434fb5bc2f2168d6d19d117edbf852c0ee8e3e664a7d5d34601b2bb41f7c8489baf391ffd331ec2ab4445e884b80f7572e522c09e4eaab22eb15ad3d71a5 SHA512 e80780df1e683ac58a50c12ae8854deb5c4bb8b08c5fde40df7f1f045fc94d76fa64221f78cff9b100588f520d03761a7994e33897722c3746675a6522e4fecc
 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
 DIST ssacli-4.21-7.0.x86_64.rpm 15888806 BLAKE2B 65577085cb3b32bd0bb30ef6eec8e1f8c903e1619eb386142864e52fb1ed2d43520ae79b1831fd6c17673a992980d06092c67ed7808ddf3cf6df5f18d3e150ef SHA512 55fb5d533d2b072ea0491f58aef054d53e744350bbf1a812c1a639f5c5964a23bb895fdf363c6dcb4531de8dab5a09d51f483389714172f3aa70a23fcf8fd3aa
-DIST ssacli-5.20-8.0.x86_64.rpm 16605930 BLAKE2B 992ea95e69f75b423c02125db55d8dab92f3e63520c9592374bda3a7fcb98d0603318d5fe0d224fbe837779e6049ffab804f5016be57d296630ce0563e9c9e78 SHA512 73ac593dbae1a9a7e5e004c2882f0dcbd39f3edfc851140e19ca6914150bf134a25367c726d8cf6bb4abcd049127be4d24e02e52e7cedaf7be5698d2314053c3
+DIST ssacli-5.30-6.0.x86_64.rpm 16639836 BLAKE2B 6df471b0db7ad948adf7d135b724800e768bd530b4e8e681472723e13b1f717b2ac48fee0b8a1652bed729a8b090f1ed135f0a531f16c7c0741923d04c69ced2 SHA512 ec79e865ffaa9477e5aa0cdc7c93c70ffb82dc8968f146aae18f1314a727d74636ab6e4c3906e770b422cf04aef92a4830757c4b351fd545b9359ab5d8fe5f9a
 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
-EBUILD hpssacli-4.21.7.0.ebuild 846 BLAKE2B 51f1af3c69cb2c8a79fddeeb2b1bc2edbe126c276799fc68c4e17c41bef6887236bbaca6904554e5aa2eb4ec0526d888b31b8992fb8adddc1c631d607805ba74 SHA512 44f24e95374d92b45ce455e18c4254320dc4fa27b780d4306d71dccf4b5a9de63d733611a2b66d6fd4a07310f3b68d826ba12be8dc796ccadc15e7e7f7d825ad
-EBUILD hpssacli-5.20.8.0.ebuild 846 BLAKE2B df1f674185443434e0448eb165f11baa7cabcefe43fbca069454b66f48e678d5982e436e201b43b9df6d53b21d4df6b7afe25b2490d07e29fd83d6602c4d369c SHA512 85669f6b9b646e38c7f46dd698763b9888a94c37755f9fbcde7d3a98a105c7614524810d8aea9554fea8bf67e507d73fe98212f746d25244fa3cbb1e56f92382
-MISC metadata.xml 252 BLAKE2B 84ce9630af2d663427fcf6fbc9832ea43e936720673088eb4a50db0e894647868f68ff3521824675235ee1ef504e4dc823efbd8d8f0b0905d58d8da94269eb2f SHA512 e44e7852efb83e01ec3ae07e390307b5de89fdd86705bfbc79432807c7b286fd56939ba92f8896c55cd70dae507b5e8ebc9d8e70c7d2756bab84cdc011c42126
+EBUILD hpssacli-4.21.7.0.ebuild 845 BLAKE2B 5b6daabba59f0bcd28bf752d1fb43c6a2a94c7077debb4c57debf4d28635945052949f59039bbc92b34e145d0f8bd53c2a24c5cff7c104259118240c2de454db SHA512 48722a44c23204b6b4a6a05fa63a2cbc3d35fccd4de263d2d2e89fafd85efbe36e693659dcf0990bf5c05fcc1e11a663f2ef1fcb4bd867bb83ea2281aba329d7
+EBUILD hpssacli-5.30.6.0.ebuild 954 BLAKE2B d471d7a44743fca0ee1d9acde14889b58e6d75fefb6f65e8ff5877fec489d72de18f401c097234635b5137ceeaed1a3a77df799d8bac1a668d89607c043255f5 SHA512 82e8e9bf19e0e29c1e40a94d6e15cd6679bfc14f70d4d6847f3de194456669b4031bab6fe5eeb43bb17ea716d8bb1e52cdd8f80adc2f61f110db22a26054fa03
+MISC metadata.xml 247 BLAKE2B f18c471812d5b8c75f2e05c4fb556108fb93554b59ee61a8215803f2654854a7401fcd62964192c228bfebfb52ae4573cfd24b29a944630c8c733d154d2b0d9a SHA512 cea16f7db3110bd4629b9265d5acdec6d70877330664f8e83f726002eb69aec7f822e9cde9c7da900451cdef60f1ceba373dfe73c73f82173bbf1d2f9f7338b7
diff --git a/sys-block/hpssacli/hpssacli-3.10.3.0.ebuild b/sys-block/hpssacli/hpssacli-3.10.3.0.ebuild
deleted file mode 100644
index fa95dc7cfd07..000000000000
--- a/sys-block/hpssacli/hpssacli-3.10.3.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# 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_5530b3f5b38b4e0781e6bf9c74"
-SRC_URI="https://downloads.linux.hpe.com/SDR/repo/spp/2017.10.1/packages/ssacli-${MY_PV}.x86_64.rpm"
-
-LICENSE="hpe"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-IUSE=""
-
-DEPEND=""
-RDEPEND="elibc_glibc? ( >sys-libs/glibc-2.14 )
-	>=sys-libs/libunwind-0.99
-	>=sys-process/procps-3.3.6"
-
-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 -rf "${WORKDIR}"/opt || die "Failed to cleanup '${WORKDIR}/opt'"
-	rm -rf "${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/hpssacli/hpssacli-4.21.7.0.ebuild b/sys-block/hpssacli/hpssacli-4.21.7.0.ebuild
index 4e46a04028ac..52b203ce7f2d 100644
--- a/sys-block/hpssacli/hpssacli-4.21.7.0.ebuild
+++ b/sys-block/hpssacli/hpssacli-4.21.7.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://downloads.hpe.com/pub/softlib2/software1/pubsw-linux/p185704664
 
 LICENSE="hp-proliant-essentials"
 SLOT="0"
-KEYWORDS="-* ~amd64"
+KEYWORDS="-* amd64"
 
 S="${WORKDIR}"
 
diff --git a/sys-block/hpssacli/hpssacli-5.20.8.0.ebuild b/sys-block/hpssacli/hpssacli-5.30.6.0.ebuild
index d308b0033cd9..0bedb3614f76 100644
--- a/sys-block/hpssacli/hpssacli-5.20.8.0.ebuild
+++ b/sys-block/hpssacli/hpssacli-5.30.6.0.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit rpm
 
 MY_PV=$(ver_rs 2 '-')
 
 DESCRIPTION="HPE Smart Storage Administrator (HPE SSA) CLI (HPSSACLI, formerly HPACUCLI)"
-HOMEPAGE="https://support.hpe.com/hpesc/public/swd/detail?swItemId=MTX_8484363847dd4e5ca2970188b7"
-SRC_URI="https://downloads.hpe.com/pub/softlib2/software1/pubsw-linux/p1736097809/v193233/ssacli-${MY_PV}.x86_64.rpm"
+HOMEPAGE="https://support.hpe.com/connect/s/softwaredetails?softwareId=MTX_1b5853f050a24da4be479f680e"
+SRC_URI="https://downloads.hpe.com/pub/softlib2/software1/pubsw-linux/p1736097809/v205349/ssacli-${MY_PV}.x86_64.rpm"
 
 LICENSE="hp-proliant-essentials"
 SLOT="0"
@@ -17,6 +17,14 @@ KEYWORDS="-* ~amd64"
 
 S="${WORKDIR}"
 
+RDEPEND="sys-libs/glibc"
+
+QA_FLAGS_IGNORED="
+	usr/sbin/ssacli
+	usr/sbin/ssascripting
+	usr/sbin/rmstr
+"
+
 src_install() {
 	local -r ssacli_bindir="opt/smartstorageadmin/ssacli/bin"
 
diff --git a/sys-block/hpssacli/metadata.xml b/sys-block/hpssacli/metadata.xml
index 542a8a19f0f6..a7fa285c7476 100644
--- a/sys-block/hpssacli/metadata.xml
+++ b/sys-block/hpssacli/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>whissi@gentoo.org</email>
-		<name>Thomas Deutschmann</name>
+		<name>Florian Schmaus</name>
+		<email>flow@gentoo.org</email>
 	</maintainer>
 </pkgmetadata>
diff --git a/sys-block/io-scheduler-udev-rules/Manifest b/sys-block/io-scheduler-udev-rules/Manifest
index 6b2cc5c78de4..06addf31af28 100644
--- a/sys-block/io-scheduler-udev-rules/Manifest
+++ b/sys-block/io-scheduler-udev-rules/Manifest
@@ -1,5 +1,3 @@
-DIST io-scheduler-udev-rules-1.tar.bz2 7503 BLAKE2B ef1c8f1cf1a94018e82a3c430860af9e7d6c31b12318b5b672ee3b9f0c51c24c69566f764c0a6c0bdfcc1342160a801d7849c0cd0e783715b2b36be1ba285a05 SHA512 7da4ec700bc508c790da916df030164da39bed223677ebc3633e1bf4ad085a9d401a3ed64dc7b07a5e90f4a60933a25a6c4584544c9022ac70e5b1b33cde0e2f
 DIST io-scheduler-udev-rules-2.tar.bz2 7927 BLAKE2B d019b7c5acb81f60fc20c8009733a3e7f58f7ddeb96e3b4333fdbb027b710904c7f8ed669638dba59044ad9dca9a9771c204e339b5cff3b9782a71062642ce36 SHA512 a78128bd8d0b954d31d0086063e47180560720c42892c04cea111096c25fbaf75c6ec4c8645eae1ffb0b3986158b40db10e591b86fb9e34f63a5ae92b37df39a
-EBUILD io-scheduler-udev-rules-1.ebuild 610 BLAKE2B 3aa316af370301a9735c506116dd83e6c5ae574a8cc50baff063fbe84ec78339633d1927f210039f2be9d163e77204296f010b36fb09e65d9ba9f20b1476eebb SHA512 4dc375a50c355d53b2f30b0f25db6778960a024a7d4e2acb6693d03494a6e87583794c0ef9dacf7bbe843ad1f00aae50fb709cbd8720c307fe578756018da7fa
-EBUILD io-scheduler-udev-rules-2.ebuild 615 BLAKE2B 8c2d5b5e4e4aeb1a90c0d4b8bf8ee8669ae0e98a44c0833aceef6dfefd1a4d23ac32e260e8280342e8ca96ed8a4fbfa608160a8fc64b8d61bab2393cf9a3c390 SHA512 1706c9e94aa9a88f3a24a297b2f5ff06ad6a3473417592027ccc40ba96850bd37fd70c94bc24c7e37f8a444be03afce9b41289e6ca172cfac30dc69af4f263e9
+EBUILD io-scheduler-udev-rules-2.ebuild 646 BLAKE2B eccb438ada286dab02d6f2be3f2aac665f431776539ec7f118103a070897a4c0346c2b92ea3a049c3075b3da22c01c829c26748b7e4560a93ea1e649a117995f SHA512 5fc550dee231103f861cc08d63dee33eafb6278c9a410b290c1fc7b9c2904847abb8f8b33269e82353645755c990dd5e5416e9bd8df0b167f5f3e2a785baa703
 MISC metadata.xml 217 BLAKE2B f8189b02494f180dac078dcd5c275d3c795f20f360f8b172c66065a2d937e396b24b8631bba4cd8567d60285ce89fc77b9539f2233bf33899c820613c48c33ba SHA512 f0c9e5b3d281fecd21b1e23a6f44c94c1c0b3220de46a177d35932111b7f1ab4399061c42833ac1ee9bd0324b139fc8db66e0d2890224d607bd3be38ae469be9
diff --git a/sys-block/io-scheduler-udev-rules/io-scheduler-udev-rules-1.ebuild b/sys-block/io-scheduler-udev-rules/io-scheduler-udev-rules-1.ebuild
deleted file mode 100644
index d6a94d739beb..000000000000
--- a/sys-block/io-scheduler-udev-rules/io-scheduler-udev-rules-1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit udev
-
-DESCRIPTION="Udev rules to allow easier customization of kernel I/O schedulers"
-HOMEPAGE="https://gitlab.com/pachoramos/io-scheduler-udev-rules"
-SRC_URI="https://gitlab.com/pachoramos/${PN}/-/archive/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="virtual/udev"
-BDEPEND=""
-
-src_install() {
-	insinto /etc/default
-	doins etc/default/io-scheduler
-	udev_dorules udev/rules.d/60-io-scheduler.rules
-	einstalldocs
-}
-
-pkg_postinst() {
-	udev_reload
-}
diff --git a/sys-block/io-scheduler-udev-rules/io-scheduler-udev-rules-2.ebuild b/sys-block/io-scheduler-udev-rules/io-scheduler-udev-rules-2.ebuild
index 2c07a1084162..780730584c3e 100644
--- a/sys-block/io-scheduler-udev-rules/io-scheduler-udev-rules-2.ebuild
+++ b/sys-block/io-scheduler-udev-rules/io-scheduler-udev-rules-2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -27,3 +27,7 @@ src_install() {
 pkg_postinst() {
 	udev_reload
 }
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/sys-block/libzbc/Manifest b/sys-block/libzbc/Manifest
index 8ee579dc25d1..b1e74ad35e99 100644
--- a/sys-block/libzbc/Manifest
+++ b/sys-block/libzbc/Manifest
@@ -3,5 +3,5 @@ AUX libzbc-no-automagic-gtk-dep.patch 976 BLAKE2B 211a33a5eac0239526f050de30187b
 DIST libzbc-5.5.1.tar.gz 128638 BLAKE2B 3cb636f29ff29bb87c86bd800231a1b45f517822e5785af599a6385705dffa1e90574e4bd2c1b310d5a0dab094cf6e878fc80b6178ea4eb028d5d1d174e7559a SHA512 cb060d06839ea207ed2e32e940348176dd0eff2279cbdb72f565bef177eb4a195feea67c4d1ed5f455e3839475e0f4557a45774129e3d9e009ea38f9134ae159
 DIST libzbc-5.9.0.tar.gz 131517 BLAKE2B eb05214ffea376930f1b4327152da687067023eab929ed1db123ea3bc80e0f036dfbe9889da2707f1c3842120d4fc3b2c8ab471731d45d5483fe947c21fc7cad SHA512 bcdf294d86867736826af06ad6d18dec31630b3f5bc6e3e98c228bec6a30efcce76a27e3c66a08ce670614ca016dc079894320cff340bafe126fcb40973e8302
 EBUILD libzbc-5.5.1.ebuild 804 BLAKE2B 8909462a8bf9a3d07b2184eff23bb543bd8b66bed38ed573f01164297ecf687aaf409ccff703263e1eafa3ed4da03d04aeb3701e0a08c036141e1b2db2651943 SHA512 cb664f86d1fcd7f74a5bd1e28ce07d042e1cdeb601f8abcfda20cba8784092ac11d4e33d99922839d074be635a14b831ada0e99ad3a895d394c05834153c1b48
-EBUILD libzbc-5.9.0.ebuild 718 BLAKE2B d3b49734684de7289851b6649b88567f70fb9b477d0dde6766c5f412fb20bec1b063d43f8ba3f75ccebe36ef83216324a2101f265f2aaf93c929b307d801dcb3 SHA512 c3f0d49e17c45a06f7c8a9cb6fb515488a03bd5916e31e4053d85fa032abf2bc5ea2cbb66b1046ef00f89abcf8da5dece72617b7e4ee295ab7b8f78b38ae5aaf
+EBUILD libzbc-5.9.0.ebuild 725 BLAKE2B 7ce0df5ed76d97a3c0610b2430552f73caa99102120bde310968ecd7747caa3045f6d9b06c1a8a8dd9e7fcd13f6e20cbff247d87205e6737554d222c929b01ae SHA512 39b849eaf81fbbc2690563a518cec3fcdba1080bf60ec83061e8cbc87609acc629f2f2339b51a0e836cb42261a3122580f69623f532ea648d730fef55144d7fb
 MISC metadata.xml 837 BLAKE2B 67dae957eefb0f1fc387e2488f4b04e56398bf036db1ac198d1ac2986fc70d9aa40376bb8d96aae223e79156a78dffa7348b5f2d578e138879b55aedb6f46e74 SHA512 2879a3b463bd30221be2f1ca7ea6ce3425dfaedab2c2b5666216cd76608844287dda50957e5386e6fd20e2689887f00b8a65a015bc9fef9c5928f9d4e9349740
diff --git a/sys-block/libzbc/libzbc-5.9.0.ebuild b/sys-block/libzbc/libzbc-5.9.0.ebuild
index 41daf6685699..f1c4a1a768fe 100644
--- a/sys-block/libzbc/libzbc-5.9.0.ebuild
+++ b/sys-block/libzbc/libzbc-5.9.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/hgst/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2 GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="gtk"
 
 DEPEND="
diff --git a/sys-block/mbuffer/Manifest b/sys-block/mbuffer/Manifest
index cfa4e4e182b4..9e036fe923ec 100644
--- a/sys-block/mbuffer/Manifest
+++ b/sys-block/mbuffer/Manifest
@@ -1,7 +1,7 @@
 AUX mbuffer-20180410-sysconfdir.patch 897 BLAKE2B 1fc57be6f5ce11f483d43dc69c9e4120b09a4c59caaee90deefd5500058ea0c8b9cd6b9b3dea1a2f21733acf4eb8a922171d791e57d658275997ca951f73559e SHA512 36964604338a0bfd0e9cb55d17b307f32dfe09d280019e8083e5909b81e091887bb8f360ef9aebf21eb8448a3d9ba305a6f7a7bc35ea4884418bb7d67e9fadb0
 AUX mbuffer-20200929-find-OBJDUMP.patch 279 BLAKE2B f22f74549eb2fba1061141616097fc01b987c846302a0fd59aaf8a0236a291207a02f0a85ec542fb217377eb40eb0983cd450aaf9a56f3df7838c29f31ab663a SHA512 20a9969de11f6eaf398627a306465df6b43ccb640176c4743ce8e8aa59b06f1837b0ef968223a0770c7aa1cf1959713526fa064f3eb54bbfabb067d834e510c0
-DIST mbuffer-20210328.tgz 148009 BLAKE2B b369fdae908cfa239e70d092f512f1613215f1a38e5f2dba9403edeb5579fe14a099f0b9950572c1e294c7d5938bd5a363a1cc3239b4553ecd24c6b805fbfe27 SHA512 69f7cac7fe49a86944092d642c6138455ba95da8e6d00abd41b37d126a9f03c3252e69795c5fb5bf8e56d0ce1461bde6b51f48c5eb7073ee49ee4e6df83d834d
 DIST mbuffer-20211018.tgz 149348 BLAKE2B 0b9fbd6b48198cb8def22687420c61ed2e60f7be5ba10365bdc324f4de33c5e1fafdad93c53031d8fb4cb2d2cbb1695e517761eb6859f2f80ffabbeacb4783c9 SHA512 9e08bec5945e7495b469578381d154c2820aed51d1afbf5d0b9bdd693acc095bb4b69e376f5e6a9a8e239f5b9adfcdc7e091d692006248447490ce0547bb7109
-EBUILD mbuffer-20210328.ebuild 1520 BLAKE2B 118ca53f14fbcd0f01b3c1bc6cc75eec9a879c65c3721f1366c3fe1bc18ccb65bfe64f5c4916358ddea8d54a4cb966e6630605172bc3ebad23896c97ce9fc8d0 SHA512 15b13c98138583bbf9046a06d30a84812d661e53cd2ec460f36869d5769185a0cc046883aa0af1b316630c40a75a705e4cd7eaf36f07ff834b4ef9a1dfcbafb6
-EBUILD mbuffer-20211018.ebuild 1525 BLAKE2B 7e679c246ce656064853ec65561a425f0e0d2c74980008e9d1213d72c0320d1b0bd0d3e8b513b45a2e46cd516d9bdbf9eef6eba313ec927e6039e551dafa4399 SHA512 02c9cb2c90a0cf0561704fa688449296182ae3e3e74452013fcc1e719be525e6bb72e36dcc99efb2689e49b3e5672fe4d0e850dfdcb72c04bd589badbf36649c
+DIST mbuffer-20220418.tgz 149535 BLAKE2B 8c7eacae791bef8ac6cd2ce57e6a5fbda7c7c233c37ccc504ad6584385df4b4df49aaf67f2d2dc7a3ee9f7e1431ba511847646a4c92616c1a4af5ac094e029e9 SHA512 aad7f764c82e3bdd4ee3fc5ac8174e716fd44cdb0418f1994d3f506d2e58264a13e15596bc8e78e9e8bb2d181875294448085bab122a2a31356d4336bb8b54a4
+EBUILD mbuffer-20211018.ebuild 1520 BLAKE2B 132ef503ce74f773cdec862735b0a6b0e37c52e8b6d88b83b9e9f688311009f0cfc2a53e47ec2e0b3f13525b8230980e8bdac5e90c1f335a132d170638f24020 SHA512 62b810ad579241a74c0fa8df9ef253b36d61d236dc5ee63f05f237c6f01bb48776092344286ab72847df935032e30ad4c642f086290a6f5cb7f9a93436b31d30
+EBUILD mbuffer-20220418.ebuild 1525 BLAKE2B a3dc8cbb58b308c03a4a338ac888b6c01ad9eabb33f9f53c6026145301d6af0d909195deb8b98b140d778f342b6d7604a343346b2ca1374a569c10ee38e075c2 SHA512 3f8e9a10399d57676a192e9334138b79bde8a5124c8cf7d880c8d87fd64d557bfd6487b4e9fc81c62336b12cea873762fc7f812a1d8e66ef45f1ff0aef133b65
 MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c
diff --git a/sys-block/mbuffer/mbuffer-20211018.ebuild b/sys-block/mbuffer/mbuffer-20211018.ebuild
index b5df3c74c1a2..67e7c990b9b3 100644
--- a/sys-block/mbuffer/mbuffer-20211018.ebuild
+++ b/sys-block/mbuffer/mbuffer-20211018.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://www.maier-komor.de/software/mbuffer/${P}.tgz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+KEYWORDS="amd64 arm arm64 ppc x86"
 IUSE="debug ssl test"
 
 REQUIRED_USE="test? ( ssl )"
diff --git a/sys-block/mbuffer/mbuffer-20210328.ebuild b/sys-block/mbuffer/mbuffer-20220418.ebuild
index 78e2c32830d4..1fb048d9a999 100644
--- a/sys-block/mbuffer/mbuffer-20210328.ebuild
+++ b/sys-block/mbuffer/mbuffer-20220418.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit autotools
 
@@ -11,7 +11,7 @@ SRC_URI="https://www.maier-komor.de/software/mbuffer/${P}.tgz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
 IUSE="debug ssl test"
 
 REQUIRED_USE="test? ( ssl )"
diff --git a/sys-block/nbd/Manifest b/sys-block/nbd/Manifest
index d1ee4fe63789..b339216fb878 100644
--- a/sys-block/nbd/Manifest
+++ b/sys-block/nbd/Manifest
@@ -1,4 +1,6 @@
 DIST nbd-3.21.tar.xz 523472 BLAKE2B 8601306966b75e5000e34d784175f287553d478e8367d488b9a3c1c11bcb7345a4ba898f02a94b8e927fbded1d3a563a4f0369ad7b49b14dcb6f5ea8d91812f3 SHA512 5dc238e6f45eb230a6f92493a8c3b4891dee98fc47e120e59c3ca31c0a698537ca03f78e43c5e7089d93d548a22b5e3853ba228536d2fc688c3edf4a590fdb3f
+DIST nbd-3.24.tar.xz 556928 BLAKE2B a07b0d8ce18cdea2e0778afbf9adfbc49f4fdc5746ec6f304f46d390adfc0a9ffb199e7c5cb6a72b3073a12a37f598e3780f0a1374b25c0e0a546653f7657d28 SHA512 b542733ca8bdfb6883591acd5cc82fd8fa64fed7ca85b01a961e0ad69b9655750e5317df9ec510b4147cc8b0b5cdfa0b43da53dd06c42863553555d710a3c85d
 EBUILD nbd-3.21-r1.ebuild 1386 BLAKE2B 94b7f258041f7cf8b0e492ff3ca9b590041b534aa8ef3b08d0ff7567eb4c673ee0512adf94a0bfd6b80bb00ed825b3172071a9a5aeeac3bd3be53116276b7553 SHA512 a5a5e49e15dc7111d5f0bf7c017180f06067172e11682e25de2a3b852ce15af3ec62edd8c0306f36f34b3b04b9bf55c3e858cec6930cd8a6bcddd032c92f5d46
-EBUILD nbd-9999.ebuild 1391 BLAKE2B 972f386515c90969add5399770d5cdb5eee86f246357ac620d13a24efbd52067d21486d31f8fc15747511afdacb04016581a3f34e77583f3243b4621a182ec81 SHA512 7b85ad69be35850d5cceac88d8c53054c0d330b47313e7e80ab14a43312e0b9b2f299d9d7832f2fe52b688a65fd37efc3173144add13f7df26edc84bfeb03b4c
+EBUILD nbd-3.24.ebuild 1526 BLAKE2B 18b7f47587ee6873b8b19a3b0a7090d86f9571b7487153c6eaa0fe6851a5a25f70c1ff38dc4f164af706cad24e71ea576de95aedf8c76d192c020076b70e9aeb SHA512 0fe662088839a0cc786a32fb0ee371e5c73b4858b9705ed497277e094bb9ebcba6cbee44a4384fff0ecb9ef695a15971bdd3ca8fa51172b45189696cae8f500e
+EBUILD nbd-9999.ebuild 1526 BLAKE2B 18b7f47587ee6873b8b19a3b0a7090d86f9571b7487153c6eaa0fe6851a5a25f70c1ff38dc4f164af706cad24e71ea576de95aedf8c76d192c020076b70e9aeb SHA512 0fe662088839a0cc786a32fb0ee371e5c73b4858b9705ed497277e094bb9ebcba6cbee44a4384fff0ecb9ef695a15971bdd3ca8fa51172b45189696cae8f500e
 MISC metadata.xml 490 BLAKE2B b6fff304d62aee96038650fd12b2f4f9d82f7a8be72214766699437563da6f4d305effe58c0beba58ad1c537d8d3ec9ee4d3a698480977be6020317f3279335b SHA512 3e495bb823aae9aa2ce314b31cfe49dc40721e01f45b0d2179f18701b18fef89732d831cd1c0ebbdf1dcef1044a0b507262c586f81897e594ef1394a41211665
diff --git a/sys-block/nbd/nbd-3.24.ebuild b/sys-block/nbd/nbd-3.24.ebuild
new file mode 100644
index 000000000000..04319fda899d
--- /dev/null
+++ b/sys-block/nbd/nbd-3.24.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2022 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="https://nbd.sourceforge.net/"
+if [[ ${PV} = 9999 ]] ; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://github.com/NetworkBlockDevice/nbd.git"
+else
+	SRC_URI="https://github.com/NetworkBlockDevice/nbd/releases/download/${P}/${P}.tar.xz
+		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}"
+BDEPEND="sys-devel/bison"
+
+if [[ ${PV} = 9999 ]] ; then
+	BDEPEND+="
+		app-text/docbook-sgml-dtd:4.5
+		app-text/docbook-sgml-utils
+		sys-devel/autoconf-archive
+	"
+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[@]}"
+}
+
+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 732367ad8970..04319fda899d 100644
--- a/sys-block/nbd/nbd-9999.ebuild
+++ b/sys-block/nbd/nbd-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,14 +6,16 @@ EAPI=7
 inherit systemd
 
 DESCRIPTION="Userland client/server for kernel network block device"
-HOMEPAGE="http://nbd.sourceforge.net/"
-if [[ "${PV}" = 9999 ]] ; then
+HOMEPAGE="https://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"
+	SRC_URI="https://github.com/NetworkBlockDevice/nbd/releases/download/${P}/${P}.tar.xz
+		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"
@@ -27,24 +29,29 @@ RDEPEND="
 	zlib? ( sys-libs/zlib )
 "
 DEPEND="${RDEPEND}"
+BDEPEND="sys-devel/bison"
 
-if [[ "${PV}" = 9999 ]] ; then
-	DEPEND+="
+if [[ ${PV} = 9999 ]] ; then
+	BDEPEND+="
 		app-text/docbook-sgml-dtd:4.5
 		app-text/docbook-sgml-utils
+		sys-devel/autoconf-archive
 	"
 fi
 
 src_prepare() {
 	default
-	if [[ "${PV}" = 9999 ]] ; then
+
+	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
 }
@@ -58,6 +65,7 @@ src_configure() {
 		$(use_with gnutls)
 		$(use_with netlink libnl)
 	)
+
 	econf "${myeconfargs[@]}"
 }
 
diff --git a/sys-block/open-iscsi/Manifest b/sys-block/open-iscsi/Manifest
index e368820e1d47..c5957c333eaf 100644
--- a/sys-block/open-iscsi/Manifest
+++ b/sys-block/open-iscsi/Manifest
@@ -2,9 +2,11 @@ AUX initiatorname.iscsi 1152 BLAKE2B 32ddfef007a3cef2c22c6f49319587065d527000d0d
 AUX iscsid-conf.d 422 BLAKE2B 2871024472d5308b395aeb8c67f7b47aed4618790295d3ef7e51aaddd32f12fafbe1b8542fc8a34d5da0233a26ee557c7e9613fa8436d9c9312a9e2f6902a1e5 SHA512 d197bbe2ce610cc2d4a1269c8d7a067ca5e3b0f3d8bb0804c2c39e0cf512bcbf7b5de45b7d6ffd5cf918dc395c7cf32c40e64b4348d00a4d0223ee44c463709a
 AUX iscsid-init.d 2094 BLAKE2B e13fc820e74a79e3c1f220b827c3188b6cb3bc149f450e3ee668d851faacd59e1e44b51250ba3f53a321d287eb81b580a332605226564269dbcd3e2762c0c95e SHA512 a5544e35da3433dfde96984d2e5783991d961554b8843f4f96d4317a38d7534864882342633ed0dc15c2f9e49a419e51958593b0de1ce84644938dafabe392fc
 AUX open-iscsi-2.1.1-Makefiles.patch 2185 BLAKE2B ab4dc518f12f0975cf472c94dfa883e98dcce57b2d203c39730ee67c4e6b548ff6554dd4ec8ffd7a624aca99e38c88284ea1bd41cbf89f077e5017e4bc45fd5a SHA512 1b37cfde4889d2f00f91cd173cb323fcb131040ac14351bb66aa4b8250cb527334e869faac4b0fa1ee9160ed7f44ffe2c9cd9a78075d3fec2ca32e0c27c0ba4b
-AUX open-iscsi-2.1.6-Makefiles.patch 3157 BLAKE2B 160e0c6c85d40bdd12561695dda6db55cce7d81de2ada55936cf3a7caeff828589c65915159151b56389c73b36f13322c49ecf79c9598da034a8f03ce9e6f404 SHA512 29206acd3e3ad73de1e1b055184cca24f6f17348c709791e4e2929940b20e6974f3e3ba34cb2de105d196c4ff546085b3436cad9881a511e56958a502b3d2365
+AUX open-iscsi-2.1.7-fix_bitwise.patch 1480 BLAKE2B c5076f91885866042d99eef8d905fef4375645863bbf840fbec6c1bbc568ee98866b7fc74b2a78eb675a72cf800c82d11fd28438e9653e696f7d6260896b3f1a SHA512 b9474d78f1616bfdcfc2e11f51faa4a0398a30d00af50a7ae885a8ea07fdf1ba06a354e2ffec777ee2d9598c386093a1f89c4bb633a85a85011f6fa42b307a71
+AUX open-iscsi-2.1.7-fix_sed.patch 1518 BLAKE2B 382889e1bcc0af1cb8306343079efe62935c3539759a0b811c03d13e7df02b248da685badf52d3cf750e704ddd30ad2404d4b2ea030ca8c5919af5b089b5af94 SHA512 29e8a3321198c9270eb3b408cd425670e8535a3299c912bd19d883ca57460fc555c2f672c41b658bcabf326c8a676a7380c3a904d00ed0ee17e83418a5232a50
+AUX open-iscsi-2.1.7-no_werror.patch 1025 BLAKE2B 2d96bc5c35708206c68281d3153bbfbbc38a052ca36d7cd3b437ac714201b393296b75896ef1d2216ddb75f0da472922f41ef400c77b0c8662f75fa6d3e0b2e0 SHA512 d59d723db29d570cc0045c32393a28ffa2d96f57adafd9f1bf278fbf2c4027231e4128e64bade460b3c9d7c81f761cd57b19f27f510f0e76fa5a666aefe60477
 DIST open-iscsi-2.1.4.tar.gz 621247 BLAKE2B 043a999b2f397a6c740d61654079d7ab966caee6cf6cfb244ddd70eae4f5201045b371ce5fbe244216a2a210a5379c92e8c3fbe62d33707cf05e7a4a20a13a91 SHA512 ae0663a964d86e6a4c19203598b859173c93ecce550f9bc9855ff735dd51a3c45822f2bc1cc99e6891c56ef1d16c42223803f07a961558fe6e38ead2164faef3
-DIST open-iscsi-2.1.6.tar.gz 623721 BLAKE2B c7c09e38fd10bd5c2a5e8ad8030cf2338de3382fe4acae0e3c1bf3cacb6e244e411b7556403e0c43fd03035836f46cc4836683188e2f159cd7fc066aef78a868 SHA512 4a32a76c1c32d7d1a01fe3a0f88ce9616a54323ec043757be73051eb41ebae8de90ce057acce72fb6fe07aa47e814c9bc6ee88b13fa7d7769ca10c5175974f1d
+DIST open-iscsi-2.1.7.tar.gz 627848 BLAKE2B c8b572dc71046b722b9455799b4360c17963f05ce2cac48f122d40fc61bef6f01b98287003fc222bdb0dd4706218add8c41d3eb40464023b9b240a8205069dd3 SHA512 619c57b988c6972da09428b3a84ca375ca46653fbfca9cb61389c70a95871b665f93b75b8e6ff2aa993bdb89e2a078a188c0a7b45c3bf9c15a16b496e9ebc892
 EBUILD open-iscsi-2.1.4-r2.ebuild 3995 BLAKE2B cde9eedfd0adce665015ced51a9a6a83c6d4e163ebcd3578c4733b9816829d815db0d0c11a502be52c15a9ec1ea47a4b248a1ed4d44e9939096281b8fc69b0e8 SHA512 7a3fa0b2296478e1fe7b00f73b6aa7dc6117781958835d6e9f038e7b6cd2b22e4ae53c78543addc69bba1079238d7b455260ce825d6ef6792865323202735896
-EBUILD open-iscsi-2.1.6-r1.ebuild 3799 BLAKE2B 4f03566c748d8db7db690ec8ec716a7c01d27bc6a646c4348ab590d6e91837b85aa1b388efe2f45382ea2c4437abebd071df9259568ad80e43f0b9424977f9bd SHA512 517b3a2d0e6d262e73569fd0d8ddf2699530c0bf00a6eb7a04ef1a7e46fb25a34079470ed86c53ac38681e9cf9016c228b88c357effa2ee9207ea1ab74d238b6
+EBUILD open-iscsi-2.1.7.ebuild 4260 BLAKE2B c739e129ed8b0b1e4060a3cd385ac2c5746b9bf9110d05fb257c62fbe600e03b4def1a66609505761ca323f1e2b69989ee1c6caf7c82d8ab29413e710c84cd39 SHA512 cbb91c0f06affd6f8bfdbbd5f78d1a2f17c12e19f4f401a51eac601e81e208446640eab79960203596a4f56f0e46e8fde30219dba0a0c538d7bbaee07babf654
 MISC metadata.xml 532 BLAKE2B 201e4a44b240ad6ba1096927924ef8c84027f092ffed238db0d92cce1fe8f37e4c927dc1f8ae8393578cf66831df2c2590409349b980edb09e5187ac4369aad0 SHA512 67ed8a95407e6cce2fbfc35a6b0df99586eff99ec51f41666de298739f233282cad15c4d9d73fb42d3d2972f85da274fe47699c87f8ba2ccc44a841d563087f4
diff --git a/sys-block/open-iscsi/files/open-iscsi-2.1.6-Makefiles.patch b/sys-block/open-iscsi/files/open-iscsi-2.1.6-Makefiles.patch
deleted file mode 100644
index a25acc0c85db..000000000000
--- a/sys-block/open-iscsi/files/open-iscsi-2.1.6-Makefiles.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-https://github.com/open-iscsi/open-iscsi/pull/333
-
-It's not the full series from that PR yet because
-our previous patch handles some of it (the most important bits)
-and some layout changed upstream pre-next release.
-
-From 96667e0e06a65c94fd875db048776aad29eea829 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Sun, 3 Apr 2022 03:22:32 +0100
-Subject: [PATCH] iscsiuio: don't clobber LDFLAGS in configure.ac
-
-The systemd check currently clobbers LDFLAGS from the environment
-rather than appending to it.
-
-But we actually want LIBS here anyway, rather than LDFLAGS.
-
-Signed-off-by: Sam James <sam@gentoo.org>
---- a/iscsiuio/configure.ac
-+++ b/iscsiuio/configure.ac
-@@ -72,7 +72,7 @@ AC_ARG_WITH([systemd],
-      *)   AC_MSG_ERROR([bad value $withval for --with-systemd]) ;;
-      esac],[with_libsystemd=auto])
- AS_IF([test "$with_libsystemd" != no],[
--    PKG_CHECK_MODULES([LIBSYSTEMD],[libsystemd],[LDFLAGS=$LIBSYSTEMD_LIBS],[
-+    PKG_CHECK_MODULES([LIBSYSTEMD],[libsystemd],[LIBS="${LIBS} $LIBSYSTEMD_LIBS"],[
-         if test "$with_libsystemd" = yes; then
-             AC_MSG_ERROR([could not find libsystemd using pkg-config])
- 	else
-From 9fbd6009cd917f1152a367fa7e5ae3993133c1e4 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Sun, 3 Apr 2022 03:23:28 +0100
-Subject: [PATCH] iscsiuio: respect LDFLAGS fully
-
-Use LIBS rather than LDFLAGS which ensures automake gets the ordering
-right (some LDFLAGS values won't work correctly if not placed exactly before
-libraries).
-
-This should functionally work the same as before, just improve compatibility
-with bits like -Wl,--as-needed.
-
-Signed-off-by: Sam James <sam@gentoo.org>
---- a/iscsiuio/src/unix/Makefile.am
-+++ b/iscsiuio/src/unix/Makefile.am
-@@ -27,13 +27,14 @@ iscsiuio_CFLAGS = 	$(AM_CFLAGS)		\
- 			$(LIBNL_CFLAGS)		\
- 			-DBYTE_ORDER=@ENDIAN@
- 
--iscsiuio_LDFLAGS= 	$(AM_LDADD)		\
-+iscsiuio_LIBS = 	$(AM_LIBS)		\
- 			-ldl			\
- 			-rdynamic		\
- 			$(LIBNL_LIBS)		\
- 			-lpthread
- 
--iscsiuio_LDADD  = 	${top_srcdir}/src/uip/lib_iscsi_uip.a	\
-+iscsiuio_LDADD  = 	$(AM_LDADD) \
-+			${top_srcdir}/src/uip/lib_iscsi_uip.a	\
- 			${top_srcdir}/src/apps/dhcpc/lib_apps_dhcpc.a\
- 			${top_srcdir}/src/apps/brcm-iscsi/lib_apps_brcm_iscsi.a \
- 			${top_srcdir}/src/unix/libs/lib_iscsiuio_hw_cnic.a
-From 980b1d36e1f5f38c6b33fe3b68a2cb89e4a77b90 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Sun, 3 Apr 2022 03:34:48 +0100
-Subject: [PATCH] libopeniscsiusr: fix version in installed pkgconfig (.pc)
- file
-
-Looks like a typo from libnvme. Previously, the installed
-.pc file had a blank Version field.
-
-Signed-off-by: Sam James <sam@gentoo.org>
---- a/libopeniscsiusr/Makefile
-+++ b/libopeniscsiusr/Makefile
-@@ -89,7 +89,7 @@ install: $(LIBS) $(LIBS_MAJOR)
- 	ln -sf $(LIBS) $(DESTDIR)/$(LIB_DIR)/$(LIBS_MAJOR)
- 	$(INSTALL) $(HEADERS) $(DESTDIR)$(INCLUDE_DIR)/
- 	$(INSTALL) -m 644 -D $(PKGFILE).in $(DESTDIR)$(PKGCONF_DIR)/$(PKGFILE)
--	perl -i -pe 's|__VERSION__|$(LIBNVME_VERSION)|g' \
-+	perl -i -pe 's|__VERSION__|$(LIBISCSI_USR_VERSION)|g' \
- 		$(DESTDIR)$(PKGCONF_DIR)/$(PKGFILE)
- 	perl -i -pe 's|__LIB_DIR__|$(LIB_DIR)|g' \
- 		$(DESTDIR)$(PKGCONF_DIR)/$(PKGFILE)
diff --git a/sys-block/open-iscsi/files/open-iscsi-2.1.7-fix_bitwise.patch b/sys-block/open-iscsi/files/open-iscsi-2.1.7-fix_bitwise.patch
new file mode 100644
index 000000000000..2ff094c83f0f
--- /dev/null
+++ b/sys-block/open-iscsi/files/open-iscsi-2.1.7-fix_bitwise.patch
@@ -0,0 +1,52 @@
+From 0a6432de1a2186449d5e6557f75a9f30e487471d Mon Sep 17 00:00:00 2001
+From: Matthias Maier <tamiko@43-1.org>
+Date: Thu, 2 Jun 2022 13:12:43 -0500
+Subject: [PATCH] Use __bitwise instead of __bitwise__
+
+The iscsi_proto.h header goes into great length ensuring that the
+__bitwise macro is defined:
+
+  #if !defined(__bitwise)
+  /*
+   * If running svn modules we may need to define these.
+   * This should not go upstream since this is already properly defined there
+   */
+  #ifdef __CHECKER__
+  #define __bitwise__ __attribute__((bitwise))
+  #else
+  #define __bitwise__
+  #endif
+  #ifdef __CHECK_ENDIAN__
+  #define __bitwise __bitwise__
+  #else
+  #define __bitwise
+  #endif
+  #endif
+
+But then uses the __bitwise__ macro instead:
+
+  typedef uint32_t __bitwise__ itt_t;
+
+(This is the only occurence where the __bitwise__ (or __bitwise) macro
+is actually used). This seems to be a typo, changing this to __bitwise
+fixes compilation with gcc-11 onwards.
+---
+ include/iscsi_proto.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/iscsi_proto.h b/include/iscsi_proto.h
+index 1d14b89..3fe9018 100644
+--- a/include/iscsi_proto.h
++++ b/include/iscsi_proto.h
+@@ -63,7 +63,7 @@
+ #endif
+ 
+ /* initiator tags; opaque for target */
+-typedef uint32_t __bitwise__ itt_t;
++typedef uint32_t __bitwise itt_t;
+ /* below makes sense only for initiator that created this tag */
+ #define build_itt(itt, age) ((__force itt_t)\
+ 	((itt) | ((age) << ISCSI_AGE_SHIFT)))
+-- 
+2.35.1
+
diff --git a/sys-block/open-iscsi/files/open-iscsi-2.1.7-fix_sed.patch b/sys-block/open-iscsi/files/open-iscsi-2.1.7-fix_sed.patch
new file mode 100644
index 000000000000..ad56b823b557
--- /dev/null
+++ b/sys-block/open-iscsi/files/open-iscsi-2.1.7-fix_sed.patch
@@ -0,0 +1,67 @@
+From 66d76978f2ffbe276e84b03a7fac1041a7c3b4c3 Mon Sep 17 00:00:00 2001
+From: Matthias Maier <tamiko@43-1.org>
+Date: Thu, 2 Jun 2022 13:17:10 -0500
+Subject: [PATCH] Do not hardcode the path of sed
+
+---
+ doc/Makefile             | 2 +-
+ etc/Makefile             | 2 +-
+ libopeniscsiusr/Makefile | 2 +-
+ utils/Makefile           | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/doc/Makefile b/doc/Makefile
+index 9ed025d..e121270 100644
+--- a/doc/Makefile
++++ b/doc/Makefile
+@@ -7,7 +7,7 @@ ifeq ($(TOPDIR),)
+ 	TOPDIR = ..
+ endif
+ 
+-SED = /usr/bin/sed
++SED = sed
+ INSTALL = install
+ 
+ DESTDIR ?=
+diff --git a/etc/Makefile b/etc/Makefile
+index d065319..2d98027 100644
+--- a/etc/Makefile
++++ b/etc/Makefile
+@@ -19,7 +19,7 @@ initddir ?= $(etcdir)/init.d
+ 
+ HOMEDIR ?= $(etcdir)/iscsi
+ 
+-SED = /usr/bin/sed
++SED = sed
+ INSTALL = install
+ 
+ SYSTEMD_SOURCE_FILES	= iscsid.socket iscsiuio.socket
+diff --git a/libopeniscsiusr/Makefile b/libopeniscsiusr/Makefile
+index 523518b..90903dd 100644
+--- a/libopeniscsiusr/Makefile
++++ b/libopeniscsiusr/Makefile
+@@ -29,7 +29,7 @@ PKGCONF_DIR ?= $(LIB_DIR)/pkgconfig
+ MAN_DIR = $(prefix)/share/man
+ 
+ PKG_CONFIG ?= /usr/bin/pkg-config
+-SED ?= /usr/bin/sed
++SED ?= sed
+ 
+ LIBISCSI_USR_DIR=$(TOPDIR)/libopeniscsiusr
+ 
+diff --git a/utils/Makefile b/utils/Makefile
+index a7eb352..15539eb 100644
+--- a/utils/Makefile
++++ b/utils/Makefile
+@@ -7,7 +7,7 @@
+ # from the top-level make file.
+ #
+ 
+-SED = /usr/bin/sed
++SED = sed
+ INSTALL = install
+ CHMOD = chmod
+ 
+-- 
+2.35.1
+
diff --git a/sys-block/open-iscsi/files/open-iscsi-2.1.7-no_werror.patch b/sys-block/open-iscsi/files/open-iscsi-2.1.7-no_werror.patch
new file mode 100644
index 000000000000..a94caebafb13
--- /dev/null
+++ b/sys-block/open-iscsi/files/open-iscsi-2.1.7-no_werror.patch
@@ -0,0 +1,26 @@
+diff --git a/libopeniscsiusr/Makefile b/libopeniscsiusr/Makefile
+index 52e453a..523518b 100644
+--- a/libopeniscsiusr/Makefile
++++ b/libopeniscsiusr/Makefile
+@@ -51,7 +51,7 @@ EXTRA_MAN_FILES = libopeniscsiusr.h.3
+ OBJS = context.o misc.o session.o sysfs.o iface.o idbm.o node.o default.o
+ 
+ CFLAGS ?= -O2 -g
+-CFLAGS += -Wall -Werror -Wextra -fvisibility=hidden -fPIC
++CFLAGS += -Wall  -Wextra -fvisibility=hidden -fPIC
+ CFLAGS += $(shell $(PKG_CONFIG) --cflags libkmod)
+ CFLAGS += -DSBINDIR=\"$(SBINDIR)\"
+ CFLAGS += -DISCSI_DB_ROOT=\"$(DBROOT)\"
+diff --git a/usr/Makefile b/usr/Makefile
+index 3fc2248..c3580a3 100644
+--- a/usr/Makefile
++++ b/usr/Makefile
+@@ -44,7 +44,7 @@ HOMEDIR ?= $(etcdir)/iscsi
+ PKG_CONFIG ?= /usr/bin/pkg-config
+ 
+ CFLAGS ?= -O2 -g
+-WARNFLAGS ?= -Wall -Wextra -Werror -Wstrict-prototypes -fno-common
++WARNFLAGS ?= -Wall -Wextra  -Wstrict-prototypes -fno-common
+ CFLAGS += $(WARNFLAGS) -I../include -I. -D_GNU_SOURCE \
+ 	  -I$(TOPDIR)/libopeniscsiusr
+ CFLAGS += $(shell $(PKG_CONFIG) --cflags libkmod)
diff --git a/sys-block/open-iscsi/open-iscsi-2.1.6-r1.ebuild b/sys-block/open-iscsi/open-iscsi-2.1.7.ebuild
index 576fdc85f330..552d373862e7 100644
--- a/sys-block/open-iscsi/open-iscsi-2.1.6-r1.ebuild
+++ b/sys-block/open-iscsi/open-iscsi-2.1.7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools linux-info flag-o-matic toolchain-funcs systemd
+inherit autotools linux-info flag-o-matic toolchain-funcs systemd udev
 
 DESCRIPTION="A performant, transport independent, multi-platform implementation of RFC3720"
 HOMEPAGE="https://www.open-iscsi.com/"
@@ -29,8 +29,9 @@ RDEPEND="${DEPEND}
 BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-2.1.1-Makefiles.patch
-	"${FILESDIR}"/open-iscsi-2.1.6-Makefiles.patch
+	"${FILESDIR}"/${PN}-2.1.7-fix_bitwise.patch
+	"${FILESDIR}"/${PN}-2.1.7-fix_sed.patch
+	"${FILESDIR}"/${PN}-2.1.7-no_werror.patch
 )
 
 pkg_setup() {
@@ -94,7 +95,8 @@ src_compile() {
 }
 
 src_install() {
-	emake \
+	# Force serial install to avoid race conditions
+	emake -j1 \
 		DESTDIR="${ED}" \
 		sbindir="/usr/sbin" \
 		SED="${EPREFIX}/bin/sed" \
@@ -104,6 +106,15 @@ src_install() {
 	# Upstream make is not deterministic, per bug #601514
 	rm -f "${ED}"/etc/initiatorname.iscsi
 
+	# QA: install udev rule into right place
+	mkdir -p "${ED}"/lib/udev/rules.d
+	mv "${ED}"/etc/udev/rules.d/50-iscsi-firmware-login.rules \
+		"${ED}"/lib/udev/rules.d || die "mv failed"
+
+	# QA: let docompress compress man pages
+	gunzip -r "${ED}"/usr/share/man/man3/ || die "gunzip failed"
+	gunzip -r "${ED}"/usr/share/man/man8/ || die "gunzip failed"
+
 	dodoc README THANKS
 
 	docinto test/
@@ -129,4 +140,6 @@ pkg_postinst() {
 		  echo "InitiatorName=$(${ROOT}/usr/sbin/iscsi-iname)"
 		} >> "${EROOT}${in}.tmp" && mv -f "${EROOT}${in}.tmp" "${EROOT}${in}"
 	fi
+
+	udev_reload
 }
diff --git a/sys-block/parted/Manifest b/sys-block/parted/Manifest
index a100dd7a7039..b7be75dd2441 100644
--- a/sys-block/parted/Manifest
+++ b/sys-block/parted/Manifest
@@ -1,10 +1,7 @@
 AUX parted-3.2-po4a-mandir.patch 275 BLAKE2B 5342cc776f557c9ef95604eb2c15ad484c4dbf102d4093dcb1d4005f2f6d4f90db2ff0fc3ceae59fd22c3442604b2abbdac48594f860ba810dc4d8dce89d6fc0 SHA512 5ef686f56d8c3939da3f24fdb6196d8858c2f980805f1cb06020d6f6996158f62b8372a233ec3ec98aae30b41034046d615e415b3abf2648db7be88e3b45a872
 AUX parted-3.3-atari.patch 421 BLAKE2B 9048176f882e66cf89cc2d79aa0ea7a550f9c649d8f54f4df102eb361c6e0be473a2e07e1ab8f63dc446422a92ced10cfb4858a27b7988c1b5a960e6e8e1d518 SHA512 59738de6f89dd6d407eef139ffe4d0925d418f4d33a30a1ead1e1f05ab7ad93e13294412d5061dd40302b9592a33b97f137089f477dc6a2febd3fe60eae77ca0
 AUX parted-3.4-posix-printf.patch 2872 BLAKE2B 55c1bef638a88f7d3b5b1f90ca28df1d0ccb40590536c0a0f10416509c3d90a2a329dd530ebbcc9945b2eefb7a3540a113d27a73c7d636b372eb9fc8e19f7eed SHA512 d16bb7e3cfccaa8b40ece90b507559857fb1a4f5a08bc93da61b7afde4b69e06de363948426cec66cbb1135d6d1d5a50206cee6cec9973e1cb02aefe50697670
-DIST parted-3.4.tar.xz 1860300 BLAKE2B c724d3d1490c62d440b9e5dc359fef7ff623bc77ae5f867d8905245cb279ec391fa07a1a774488ad3bf7a2c477007264d7bab2635a544be8f94dc706a654a711 SHA512 e69bd1b610778e980d4595d04892f2ea1faf4ae9bfc98cd62abfc70066423f08ddaa396f9461c7beb1330d023232274606b6b26091a0458aeedd0f3f57536690
-DIST parted-3.4.tar.xz.sig 508 BLAKE2B 112ad0158b1100bd9150a7c87e8f93e67d42870b82a17d4d0aa8bb5e46306f837f3f99feabaf301f8cd640c299174e5f5acf152dd1f20ea2b7ace73d57d31f14 SHA512 6b11812267e66470ba2908ee1cc78b232b0bc2519787f5a17b92cd5f8ba904b1a836833f19c5244b23d4c7810437eeb26fbbd68fac819391b342709682345472
 DIST parted-3.5.tar.xz 1871824 BLAKE2B 5a63987f4d2c0bfd28f36112c2354f8dce7f87e962f4772bb0db34c070dd773b280959c6c33128422e8d60efe454c825401551c3c88541839b9a859a3d207f55 SHA512 87fc69e947de5f0b670ee5373a7cdf86180cd782f6d7280f970f217f73f55ee1b1b018563f48954f3a54fdde5974b33e07eee68c9ccdf08e621d3dc0e3ce126a
 DIST parted-3.5.tar.xz.sig 488 BLAKE2B 001d01be154b3c2fd232c6436d7a5d21a2d006a5b894aef1caff5297f993cae53fd6590a0eb3f40e34be5b5fcfbb20cd53d6c8949b8521f848bb7c0bde7dff0e SHA512 2ea1209325595416aa9ee27a0e85ca38bce50ca885d3b52ab1c1fb1b68b78d7887386ea3120274648056d2f1d9dca00b77236991765d84ad226c1b1f5a3f5c62
-EBUILD parted-3.4.ebuild 1529 BLAKE2B bcf56fbeb5c6fffa1c591e1fac4ee20e08e12746d696cfec201f8db7573104260b72d9926863ee09871c78d70746f18c5a37a39be584fde2b033c360ba950ed6 SHA512 2ca888cc646023fa8eb65ab154cc0213793956e510226cbbc27888c18e9a77b7b5c0283bfb7079ef92abbb5936ebbc1f9b702564cf5b8db799d57ad03710e1ca
-EBUILD parted-3.5.ebuild 1544 BLAKE2B 8618fb140e8156fae5b6a3a016762493e02848e5d9b6304f5588c80ae481a1e527b765d47e6fc36a633e44f2ffc06e9c2e0bae49ff8328925666892cd9a59359 SHA512 22b31307c04fc1a1a194854755fa53f592574394a6eb90497f562eb9ade58718fd7452f431dfac0a6124155c0eff21ccee57eb79a7dec2512bb508b364b32cd7
+EBUILD parted-3.5.ebuild 1544 BLAKE2B 2c179661fdc9fe2e7567d33d8e86b35301c064a7c190d81346633c4004ed06a5d55f1637e9baeb6e9735c6faf4c432fcbe6cbc09a3644ddc9eac373c4fb4c65d SHA512 3b862228020cd7edd87da8624773fba4bc996d9eab1a2fa5cd61b5a40d894520677a4cce8843c83578c31517885c4311fcc66b6df6b89a8f72f8fd4b00e24a2d
 MISC metadata.xml 887 BLAKE2B 04b4f255209a5d1c26fe4d84eb6a2d0fe7b87ff30fb2cb0425685c277eecbc498a7886ec328fdf2456bc02af4d787cd7eed16e2a9a02c5b8ef8f146d3c551d77 SHA512 6cacc6560766381699e0c46241a9446260e984a78eb9c8d39486e699d4880e2ae712b199b628a3fcdfe9cd98cfe18b47198675e8546cf84d89fbe464e2ab1997
diff --git a/sys-block/parted/parted-3.4.ebuild b/sys-block/parted/parted-3.4.ebuild
deleted file mode 100644
index 338886d0c62d..000000000000
--- a/sys-block/parted/parted-3.4.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit verify-sig
-
-DESCRIPTION="Create, destroy, resize, check, copy partitions and file systems"
-HOMEPAGE="https://www.gnu.org/software/parted/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
-	verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="+debug device-mapper nls readline"
-
-# util-linux for libuuid
-RDEPEND="
-	>=sys-fs/e2fsprogs-1.27
-	sys-apps/util-linux
-	device-mapper? ( >=sys-fs/lvm2-2.02.45 )
-	readline? (
-		>=sys-libs/ncurses-5.7-r7:0=
-		>=sys-libs/readline-5.2:0=
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	nls? ( >=sys-devel/gettext-0.12.1-r2 )
-	verify-sig? ( sec-keys/openpgp-keys-bcl )
-	virtual/pkgconfig
-"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/bcl.asc
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.2-po4a-mandir.patch
-	"${FILESDIR}"/${PN}-3.3-atari.patch
-	# https://lists.gnu.org/archive/html/bug-parted/2022-02/msg00000.html
-	"${FILESDIR}"/${P}-posix-printf.patch
-)
-
-src_prepare() {
-	default
-	touch doc/pt_BR/Makefile.in || die
-}
-
-src_configure() {
-	local myconf=(
-		$(use_enable debug)
-		$(use_enable device-mapper)
-		$(use_enable nls)
-		$(use_with readline)
-		--disable-rpath
-		--disable-static
-	)
-	econf "${myconf[@]}"
-}
-
-DOCS=(
-	AUTHORS BUGS ChangeLog NEWS README THANKS TODO doc/{API,FAT,USER.jp}
-)
-
-src_install() {
-	default
-	find "${ED}" -type f -name '*.la' -delete || die
-}
diff --git a/sys-block/parted/parted-3.5.ebuild b/sys-block/parted/parted-3.5.ebuild
index 0f5b5f649c82..a0ad8a3b24f9 100644
--- a/sys-block/parted/parted-3.5.ebuild
+++ b/sys-block/parted/parted-3.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="+debug device-mapper nls readline"
 
 # util-linux for libuuid
diff --git a/sys-block/partimage/Manifest b/sys-block/partimage/Manifest
index 4cd65b446894..e569a2795358 100644
--- a/sys-block/partimage/Manifest
+++ b/sys-block/partimage/Manifest
@@ -3,12 +3,10 @@ AUX partimage-0.6.9-minor-typo.patch 313 BLAKE2B c0d04a86e0d4c27ce8a1b097525c029
 AUX partimage-0.6.9-missing-includes.patch 834 BLAKE2B 713279432e869a35b9db5a68db5a1c9f88248c7d89af2d716d75b9d0382df74d72c1a15b5789377b47dcc1dd75bb26512ea6829826745864d37c250387b3c84b SHA512 c1a8251b2ac48add258136edf54f19660ca5528842eac693e9ae1dc47d9c5446037c39237f8eefbfb6def041c7c06826aab8aed67faa7c1e50f027d649cf9bc9
 AUX partimage-0.6.9-openssl-1.1-compatibility.patch 1445 BLAKE2B 086fa11a2dc3326b86cdfd43abda921fbf7a03c95adf7cba28675ed5c8334582feedd0e1adbe16e7750333fcf730d67fd02f3a9a49a8f4d08881964eff51dadb SHA512 96c398a3d536ed6dc54ef8d6012f1ecefe78fd8a27b74966ba8d6095e593cbcd33213dc485c6dc13ee45a517928de2bce639b5679e91ed2aea2adb1f5b3efba6
 AUX partimage-0.6.9-zlib-1.2.5.2-r1.patch 983 BLAKE2B 6ee4dba05298ea6d38f4d3917385ffcb91b5f39515d00a8cd12e16087b24821f672e20e3d9591c5681709a3e109b9f213b222eaa96f46a4c884b6b3b2106ebce SHA512 dc1e64c0b852b8f24ed604956c0977cca7a246ee66f9c36a901e26396e9a5f4f99ac0cceb2d5b9c165060fa360519d24e77ea5464479019e8c6b20b93e82cb05
-AUX partimage-0.6.9-zlib-1.2.5.2.patch 975 BLAKE2B 0e7e1de1ef590f74b46d94aaaa6eaf2eb62f06c3f33432d0201c820ec4e218d746ee8964e8cdfa1fc31bf31da1fb18fdfe3cb798cbb3111c17194dadbf4d6707 SHA512 8f5310a65e77822f816bedca9281be7627246f111960fc4092c2e3d44fa1bfcea786c130899970ce35da8be536491ae46b0ac1825d85ab6ccb6b1332f2f1b4e2
 AUX partimaged.conf 307 BLAKE2B f1d0bc946a517f4896b55c749c0f244731d413119dfc15c22f5e0834ca87cdb37b278f8907bb18dade3a1ab48cbea3a4d7ef5b836af32260cbf1653627855a2f SHA512 1be320a8dceb3076e6aa2d8b1a8a4d01a380ad1209133997fd0d87cf1d0974fc4877c3c8b41c07fbb99249c8a00132f2c5fa7ffadf26f4e41cc2abfcd6b62116
 AUX partimaged.init.2 628 BLAKE2B 872f72a4407ca0f923220e2c313779a0e52b6179b753567e125edfa983856695a88b49af2dd005b6bce0e9951ad11177611d3029cd2e02d28ab26b1195847660 SHA512 48919e1be73d0aaeeaf0f8b510af05eda613aa7aa6773e0886ca2d46119521326f46d8503f23b2dcb133ec4c8bc5a89f92787275bba869c6990074825515278f
 AUX partimaged.pam.2 249 BLAKE2B e40a15c5fe4dc394cbcf9c478c3c764e67ec317f31c039738c87b90fec79577a191ae85ad0b774e8b415b79bd29460c929f094e4e3210660989a7bdb9939fe8a SHA512 ad55a61e574dc44cdda723bb5a46349d15e50353dcdb99474b9acafd56c93bc6ffdd75f5b0d9e80849d9bebf5c7b9a2f84c7cefc5f0a86f54f9477a0962794cd
 AUX servercert.cnf 980 BLAKE2B 0660f9b92fe422754e36d6ce1889e8b8feb40954b36b3e00e58f5e534b85171ac42e66f74020a55dd1b14d56d7764c94427b8d1d112ca1a878dff388ac3ea787 SHA512 8aa0592ce0be3f08124880b823db59aa167e7d509ea1a9b48d9f895482f96e99a6e4df330c567b9ce331eed43cb4f1a70b1b7727878972a8b074265898b1e557
 DIST partimage-0.6.9.tar.bz2 666522 BLAKE2B d9a240f82a7b6ae73997df46c964fdddf8dddea9e3bd9548252d9409a526358714908316c52864b60bc9fcc1113a5e1c6cf294faff6845a183c7ffe1012475a6 SHA512 252885921b23933fdcdf0bb6efa4b82066b08ca95cc653296912d384ae875b421c1d39f347a90115315139176d4eab4a930c24919c2d38cf00ed29c764cd14d9
-EBUILD partimage-0.6.9-r2.ebuild 3562 BLAKE2B 80cca8ac3f798ea30706d000de2c705f6bb1788e85368e3ea3decaa6797508088e2f6a23972e422fc0c3ad09c568a3d0bebddb9a915ecef1c951b608b1e1e0b6 SHA512 362ea71a94a9e11e02596a9a5baf9bfb9070292f632b5b373ad2b45a4ba08cb859478b5c0cfb060236e247d5767e5bcea1ad26239e36cd9e84091504b272d5f6
-EBUILD partimage-0.6.9-r3.ebuild 3448 BLAKE2B 83c6ee6fabc66553b8bb3c160944b039ff89923d59646f17b6afdbb106d6c15ca1a94df63c01c189f3724ee7339bd1b9ecbe416ee5bd8e8d2cdcd36456415dd5 SHA512 095a059e0756c3fad49e102d6b2639735af651485808af21c5926637e7c93dfbe73eb41cfe57bbf8cc590e85eb874a768cf032389f22d300ab38800b5d149dcb
+EBUILD partimage-0.6.9-r3.ebuild 3452 BLAKE2B fd4613278a34e0b5c1275a10b1898fe8d4c343df19aac6ed90a2ec056eec380a61660873219a212029ff025be3712d8a1e5e8c763fa7e86fb179ee4736a2dd14 SHA512 0c71b580820caebb21b5c18f09e5751c3d60c7c845673fa076f224aa196dd908536930c9ef1ec9a0e41121b08555ccae4879538e6b0d66d85faa88340befab3a
 MISC metadata.xml 428 BLAKE2B 61e6517a2ee09ecc1093f4a90bae9cd7a1228cad3672bfaefba6a3d0785f34d3dfe35689c0798f0db3319441d31777b8f2bc2ca93ccef89780d280c6f0b26130 SHA512 2d0d8f33b9952b027e292899d5c046bed94a56b126d9a3a446ee9e5dc4f48e2a4cd5970cef576b8e72c2926b10ec15e6af2031347a7209a84470fafe3d92a89e
diff --git a/sys-block/partimage/files/partimage-0.6.9-zlib-1.2.5.2.patch b/sys-block/partimage/files/partimage-0.6.9-zlib-1.2.5.2.patch
deleted file mode 100644
index 57f87a5d5225..000000000000
--- a/sys-block/partimage/files/partimage-0.6.9-zlib-1.2.5.2.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-http://bugs.gentoo.org/405323
-
---- src/client/imagefile.cpp
-+++ src/client/imagefile.cpp
-@@ -783,7 +783,7 @@
-   else if (m_options.dwCompression == COMPRESS_GZIP) // Gzip compression
-     {
-       showDebug(1, "open gzip\n");
--      m_gzImageFile = (gzFile *) gzdopen(m_nFdImage, "wb"); //"wb1h");
-+      m_gzImageFile = gzdopen(m_nFdImage, "wb"); //"wb1h");
-       if (m_gzImageFile == NULL)
- 	{
- 	  showDebug(1, "error:%d %s\n", errno, strerror(errno));
-@@ -1098,7 +1098,7 @@
-     }
-   else if (m_options.dwCompression == COMPRESS_GZIP) // Gzip compression
-     {
--      m_gzImageFile = (gzFile *) gzdopen(m_nFdImage, "rb");
-+      m_gzImageFile = gzdopen(m_nFdImage, "rb");
-       if (m_gzImageFile == NULL)
-         THROW(ERR_ERRNO, errno);
-       else
---- src/client/imagefile.h
-+++ src/client/imagefile.h
-@@ -41,7 +41,7 @@
-   COptions m_options;
- 
-   FILE *m_fImageFile;
--  gzFile *m_gzImageFile;
-+  gzFile m_gzImageFile;
-   BZFILE *m_bzImageFile;
- 
-   int m_nFdImage;
diff --git a/sys-block/partimage/partimage-0.6.9-r2.ebuild b/sys-block/partimage/partimage-0.6.9-r2.ebuild
deleted file mode 100644
index 34732ed47292..000000000000
--- a/sys-block/partimage/partimage-0.6.9-r2.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools flag-o-matic pam user
-
-DESCRIPTION="Console-based application to efficiently save raw partition data to image file"
-HOMEPAGE="http://www.partimage.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~sparc x86"
-IUSE="nls nologin pam ssl static"
-
-LIBS_DEPEND="app-arch/bzip2
-	>=dev-libs/newt-0.52
-	>=sys-libs/slang-2
-	sys-libs/zlib:=
-	!nologin? ( virtual/libcrypt:= )
-	ssl? ( dev-libs/openssl:0= )"
-PAM_DEPEND="!static? ( pam? ( sys-libs/pam ) )"
-RDEPEND="${PAM_DEPEND}
-	!static? ( ${LIBS_DEPEND} )"
-DEPEND="${PAM_DEPEND}
-	${LIBS_DEPEND}
-	nls? ( sys-devel/gettext )"
-
-pkg_setup() {
-	enewgroup partimag 91
-	enewuser partimag 91 -1 /var/lib/partimage partimag
-}
-
-src_prepare() {
-	eapply -p0 "${FILESDIR}"/${P}-zlib-1.2.5.2.patch #405323
-	eapply "${FILESDIR}"/${P}-minor-typo.patch #580290
-	eapply "${FILESDIR}"/${P}-openssl-1.1-compatibility.patch
-	eapply "${FILESDIR}"/${P}-missing-includes.patch
-
-	eapply_user
-
-	eautoreconf
-}
-
-src_configure() {
-	# XXX: Do we still need these?
-	filter-flags -fno-exceptions
-	use ppc && append-flags -fsigned-char
-
-	local myconf
-
-	use nologin && myconf="${myconf} --disable-login"
-
-	if use pam && ! use static; then
-		myconf="${myconf} --enable-pam"
-	fi
-
-	econf \
-		$(use_enable nls) \
-		$(use_enable ssl) \
-		--disable-pam \
-		$(use_enable static all-static) \
-		--with-log-dir="${EPREFIX}"/var/log/partimage \
-		${myconf}
-}
-
-src_install() {
-	default
-
-	keepdir /var/lib/partimage
-	keepdir /var/log/partimage
-
-	newinitd "${FILESDIR}"/partimaged.init.2 partimaged
-	newconfd "${FILESDIR}"/partimaged.conf partimaged
-
-	if use ssl; then
-		insinto /etc/partimaged
-		doins "${FILESDIR}"/servercert.cnf
-	fi
-
-	if use pam; then
-		newpamd "${FILESDIR}"/partimaged.pam.2 partimaged
-	fi
-}
-
-confdir=${EROOT%/}/etc/partimaged
-privkey=${confdir}/partimaged.key
-cnf=${confdir}/servercert.cnf
-csr=${confdir}/partimaged.csr
-cert=${confdir}/partimaged.cert
-
-pkg_config() {
-	if use ssl; then
-		ewarn "Please customize /etc/partimaged/servercert.cnf before you continue!"
-		ewarn "Press Ctrl-C to break now for it, or press enter to continue."
-		read
-		if [ ! -f ${privkey} ]; then
-			einfo "Generating unencrypted private key: ${privkey}"
-			openssl genrsa -out ${privkey} 1024 || die
-		else
-			einfo "Private key already exists: ${privkey}"
-		fi
-		if [ ! -f ${csr} ]; then
-			einfo "Generating certificate request: ${csr}"
-			openssl req -new -x509 -outform PEM -out ${csr} -key ${privkey} -config ${cnf} || die
-		else
-			einfo "Certificate request already exists: ${csr}"
-		fi
-		if [ ! -f ${cert} ]; then
-			einfo "Generating self-signed certificate: ${cert}"
-			openssl x509 -in ${csr} -out ${cert} -signkey ${privkey} || die
-		else
-			einfo "Self-signed certifcate already exists: ${cert}"
-		fi
-		einfo "Setting permissions"
-		partimagesslperms || die
-		einfo "Done"
-	else
-		einfo "SSL is disabled, not building certificates"
-	fi
-}
-
-partimagesslperms() {
-	local ret=0
-	chmod 600 ${privkey} 2>/dev/null
-	ret=$((${ret}+$?))
-	chown partimag:0 ${privkey} 2>/dev/null
-	ret=$((${ret}+$?))
-	chmod 644 ${cert} ${csr} 2>/dev/null
-	ret=$((${ret}+$?))
-	chown root:0 ${cert} ${csr} 2>/dev/null
-	ret=$((${ret}+$?))
-	return $ret
-}
-
-pkg_postinst() {
-	if use ssl; then
-		einfo "To create the required SSL certificates, please do:"
-		einfo "emerge  --config =${PF}"
-		partimagesslperms
-		return 0
-	fi
-	chown partimag:0 "${EROOT%/}"/etc/partimaged/partimagedusers || die
-}
diff --git a/sys-block/partimage/partimage-0.6.9-r3.ebuild b/sys-block/partimage/partimage-0.6.9-r3.ebuild
index 66b9be9366b3..47a749a03dd3 100644
--- a/sys-block/partimage/partimage-0.6.9-r3.ebuild
+++ b/sys-block/partimage/partimage-0.6.9-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ppc ~riscv ~sparc x86"
 IUSE="nls nologin pam ssl static"
 REQUIRED_USE="static? ( !pam )"
 
diff --git a/sys-block/partitionmanager/Manifest b/sys-block/partitionmanager/Manifest
index 40d18dfa2662..3f8f67d051ff 100644
--- a/sys-block/partitionmanager/Manifest
+++ b/sys-block/partitionmanager/Manifest
@@ -1,5 +1,5 @@
 DIST partitionmanager-21.12.3.tar.xz 2098684 BLAKE2B 3a6301a1bdd3187853528e0e43d5f22576acf3386bacaaf48386f7db2c9f4de2ff657f4b08a46acc67a9aeb686be411af1f25f693a3326e955093199cd255ca0 SHA512 3d85b323b8c00f17b3dfe7de3b4654e21c5ebb9d166aa9ef7929e12533a5568bfe92bcddc746c639852103df3b6a4bec975813867857d6f0bff3aef35d8665f3
-DIST partitionmanager-22.04.0.tar.xz 2111220 BLAKE2B 2464a841927007a6ca3d82733362e8d8f3cb781fc8908f4d58988ebaae546ab710ac172b62c129534746aacaf46c781b4a96d99f6361f58e8cb5a05c83ac4b45 SHA512 674fc394a694d282b9633ec71b4e2a83fab0c080c163a20766bf3b526e35e2c8393c5a8fef67c274e623d48a186c89a82df8083bf4672d266d95374ba9a69f26
+DIST partitionmanager-22.04.2.tar.xz 2112176 BLAKE2B 033281d2d7b865f363e0d68a0fc17805c4499cb6107b0f6c124c868346da63109eecb087082394e66b1368667aaef391ed2fad8a748b7af6aa240a95415c0001 SHA512 09715df9012b5dab83ce635ca1d2e90e13455a1b798fc1c0a260dbfbc85a48d41db2a96652abc4b8d97a0128c292d360208ce0a6763a4ba5c19963dffc16af42
 EBUILD partitionmanager-21.12.3.ebuild 930 BLAKE2B 05aaf06fe3a21e898bc25a51a7f3e28cbd431623fe45bc5a9deef334fb2ae62dc9e14a6971a3d4aeeeb4677769d543a08c154df029a7668039c64c27f3938132 SHA512 feec4a7aa7dea7478228d83fe624499a9f87b4f402ebd23a018a26114d3d7f657af804f41298223fc85e45a864c43e773981732c86b85f5de98023fb9d492ded
-EBUILD partitionmanager-22.04.0.ebuild 953 BLAKE2B 508be465c3177cfec9c2847db071649abb1be646feef2e1ab28bba8d153d87bd437c89fe535a87ee6ae62de1b9f2ed04ad70396880301956e443a1d61eb0fb3b SHA512 34a727b742ea0462382a6cce08c7fedc699f52459902b33faf157eb52d1232e3a40451952c4cbd31b19966a63830d1cdf20369d995f388c310e607904480828f
+EBUILD partitionmanager-22.04.2.ebuild 953 BLAKE2B 1024cc6563fbe3f0b30b5551ba2af926468d9e3ff283e17c7930e3bd6a7b03b1274b98a4c9dec29415e136bffdfd3f152f4de7188a74eb1ceef4ba85809ee084 SHA512 4fed8c4fce94a2a2ab921cd4f445f0abc385bbc86a6f83dc6d4ec143102c19191df991cfb10e0946c5b7121b9c19b20be62b16d5c189da5897a9b08af8048a3f
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/sys-block/partitionmanager/partitionmanager-22.04.0.ebuild b/sys-block/partitionmanager/partitionmanager-22.04.2.ebuild
index f6356d0eae43..475d20333d03 100644
--- a/sys-block/partitionmanager/partitionmanager-22.04.0.ebuild
+++ b/sys-block/partitionmanager/partitionmanager-22.04.2.ebuild
@@ -7,7 +7,7 @@ ECM_HANDBOOK="optional"
 KDE_GEAR="true"
 KFMIN=5.92.0
 PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
+QTMIN=5.15.3
 inherit ecm kde.org
 
 DESCRIPTION="Utility for management of disks, partitions and file systems"
diff --git a/sys-block/sedutil/Manifest b/sys-block/sedutil/Manifest
index 43816c01bd06..4a4f8b677918 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.20.0.tar.gz 301067 BLAKE2B 6eb18b15a00a2555684459f00c59a9ffa1c0a85ab275bfd4de50225e3e7e9990751c7e4065987527f9c9c798c52abb5d45ef2336c72d6ee1c0e06c8a668ca210 SHA512 b85891f1c519295bf9551ffc2488300611f519aec88c60d74555e0870e125efd6153a49a6ae5a9783102e0ad0fbb148a0c0a804a61984934c23020add85287d3
-EBUILD sedutil-1.15.1.ebuild 568 BLAKE2B 17152c8491cd36b7570d3e61b7281833bd5f87e8ab0cb8d8e29b886e51ea9ecb39f1ccf6909f9825df277dad21a05388ced24862c57dc0db6573bf03028e7616 SHA512 d41fd49f59f100717e9f375d6a34001ae7a4b2998d1aaf2d66f310e520808cb5eef5f1a15aa0c4ab79ea597c364b26cb1cc1ad5c8116de5745437c35ef9b51b1
-EBUILD sedutil-1.20.0.ebuild 577 BLAKE2B 29e44a586904a5d1032e04283d3092f33cb7acceb179e05910653cdf7c72e8f76513bf150f2e97b56d0f61c9d045bc870fcff250b050c7fac101a2d9ec2159db SHA512 e5315f8a1fb54743fc20846c596fcce972bc57e0ace89e801bd39d21452dc54971e1f4a248c0bc1ad5f7d03318b5e4158b88003e8b120c2f4efc5fc407e697ad
+EBUILD sedutil-1.20.0.ebuild 575 BLAKE2B 6210f4b420e4acf67c0f7b3ab52fabe1017486fcf8442535aab50d32a52f9f93f7ed07821ef503791b800e5dea08084fa907c93715528b84367809c043ad94c7 SHA512 82b316e966d508f7fd1415f956ba4167535ebb794c617182372d779f0b2988ea659b45b5fc67d97d0a1d5cdb3ea5c97ddd3084cdf8fded412f71f2cf8b1d55c2
 MISC metadata.xml 311 BLAKE2B 759819d08ad9f60ef24922d6520618640ced0b1c3a7973c92c4ae63029e6dfc4183b4dbbfac4d1d97b8de10c6cef371da0dbb507d4cde00dda21e6667863f2dd SHA512 b5e52382be6323223e43fbdf2e6fdf2d3e7b264b16c72cf8f27e052e1025080147809c79cd30d58299ce8ba7b9fac6ffaff82c33cefd0244a608103abb37bb31
diff --git a/sys-block/sedutil/sedutil-1.15.1.ebuild b/sys-block/sedutil/sedutil-1.15.1.ebuild
deleted file mode 100644
index ac1f377a3325..000000000000
--- a/sys-block/sedutil/sedutil-1.15.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-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"
-
-src_prepare() {
-	default
-	# https://github.com/Drive-Trust-Alliance/sedutil/pull/49
-	sed 's: -Werror: :g' \
-		-i configure.ac \
-		-i Makefile.am || die
-	eautoreconf
-}
diff --git a/sys-block/sedutil/sedutil-1.20.0.ebuild b/sys-block/sedutil/sedutil-1.20.0.ebuild
index 07ea9f298216..917e43286854 100644
--- a/sys-block/sedutil/sedutil-1.20.0.ebuild
+++ b/sys-block/sedutil/sedutil-1.20.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Drive-Trust-Alliance/${PN}/archive/${PV}.tar.gz -> $
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 x86"
 
 src_prepare() {
 	default
diff --git a/sys-block/storcli/Manifest b/sys-block/storcli/Manifest
index b86a53aa1418..042359e0f2d9 100644
--- a/sys-block/storcli/Manifest
+++ b/sys-block/storcli/Manifest
@@ -30,4 +30,4 @@ EBUILD storcli-7.1508.ebuild 1686 BLAKE2B 905183e8003dee1d7317633157662844b35ba8
 EBUILD storcli-7.1613.ebuild 1686 BLAKE2B 620c6f13830d7ef1470f1d6ef1f2f0d37528b3b64506283c4f5fd4bd575f6c6867d7b1a2b96befb34df8f666800f40c2cf91e75b13d4e2f92c9df287b977abeb SHA512 4eae2f7667481130727e8fdb13bbdc8e6df08eb10c2fc11453e5ffc597cea5c06b43a0a5fcea5d3d2eabe3fd189cff4394aa8495bdba77a821ce287b8db2861d
 EBUILD storcli-7.1715.ebuild 1686 BLAKE2B 840605886041ef5a01949bc69cb64eaab3de7025f77e6da7f8a49d5364b1308d3fcfb24c8e2b4768768b97ebf74dde7f8283664b10546aad19b6f2a0986185d4 SHA512 e2dd6f7a5e9f7841ba04a2eaaa99534c9d5aaf39ec2293a46f148cf0789e81668afb2b995600f29a84a889ac46ee8ef5d19e7e3c0bdce18499d0bb8cf7a334b5
 EBUILD storcli-7.1804.ebuild 1690 BLAKE2B 9b9e93aafd75777ea2e013b25024f54afda66e5b7d09102efb7d42675d6b3015d3e213a9cea2c29a58ba7378526e5cd1d9a1f946cd5ec3ae037dbcc6b001fa69 SHA512 f46ce5a76445f20ee86a22394b4ad67b090f47cab6f3ff0397ba8faf902a5420235a9f11cd0b4b18dcf03631faa9028d1f598b5c11f94e0fe2b6fa32221613a7
-MISC metadata.xml 252 BLAKE2B 84ce9630af2d663427fcf6fbc9832ea43e936720673088eb4a50db0e894647868f68ff3521824675235ee1ef504e4dc823efbd8d8f0b0905d58d8da94269eb2f SHA512 e44e7852efb83e01ec3ae07e390307b5de89fdd86705bfbc79432807c7b286fd56939ba92f8896c55cd70dae507b5e8ebc9d8e70c7d2756bab84cdc011c42126
+MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/sys-block/storcli/metadata.xml b/sys-block/storcli/metadata.xml
index 542a8a19f0f6..115e9d64a669 100644
--- a/sys-block/storcli/metadata.xml
+++ b/sys-block/storcli/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>whissi@gentoo.org</email>
-		<name>Thomas Deutschmann</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/sys-block/tgt/Manifest b/sys-block/tgt/Manifest
index e7994e15f249..39150ab898e4 100644
--- a/sys-block/tgt/Manifest
+++ b/sys-block/tgt/Manifest
@@ -4,7 +4,9 @@ AUX tgtd.initd 3435 BLAKE2B d2441a515c7a270472efd0c4ef5e928827bde54b248d09bb47f4
 DIST tgt-1.0.79.tar.gz 297825 BLAKE2B 5b48e8390ce092d2b34a7ce4bb5845ba8beb0bd6965877d1109c80b78315eea970537601e7286e1eebcdfe8f8a8b545d58b5f64185ae016f887fe0d0854c2d52 SHA512 8cae6c43521e087fed72f98ae9659995961f987170c9799f8ebb018c0571ae78f79ce490a42dd0fddc6d1c3e946105e00b7cb02e3186026e4642d1711a990fe1
 DIST tgt-1.0.80.tar.gz 298256 BLAKE2B 3a678730b3c492832b96e160e9672354aa32a3cc463e2845b1b475c238172b99c1706d3d387697c199c4f3004d8b2c4230d17bd356ce9103028525f8007c89a9 SHA512 6e48013a7da527799f25dc224bb261f7c5cf0aa3893bc337b9f4878a45d116be701a373c533ab6fa79771ccd633501c83b48084828bf6167af72e35795bb1c4f
 DIST tgt-1.0.82.tar.gz 304687 BLAKE2B 42b43e7f9c23ddacba1c573b189480fc7e34bd5bcc58a8267e56b79d7e5a54d65c5624ac33ed7334c32085ea2fbd3c0719f82188262934658eda291c059e53c9 SHA512 e81a56fae8010ee2af8643b6accc1e51f6667e27b07c986e6a5412dcb483b46ccc0e4fe1aeb399c352282284fe516f3fc1cab5d8cbb431cc9f97f00d5faa0430
+DIST tgt-1.0.83.tar.gz 304631 BLAKE2B 64374e3ffa0fd73f25172e24b233d001dc2b70cbc08116f167de9d625d493dca330e84f73683d6cc74ea76f5bd9fa940cec54d43ebc9c41ed1ff54f5dc3a6e39 SHA512 0c97900aada010b84585a7ad2b1c4654db0fdbc4caed1dea05d00518340b23691ba91f4bb3c677b420a3f4e67f4b061055f877c050ea1d758f2ebb75771b1cf5
 EBUILD tgt-1.0.79-r1.ebuild 1507 BLAKE2B 337c12c08b063bea7e8c672cd0ee0a25abc0a09796d4a5527f89661f9c534891407497f36c6fdd6232884cdc5059ef4dcf1be83a302ab0940e5af249358b8e94 SHA512 8e07f56c0b0d560cd40e672fe55a1dfdf464a7d3bef22fb7789aeb646487b468f5065e76e6a788b5c822416cbcec8f196cb71bdc30127a5efc1dd612dd2ee949
 EBUILD tgt-1.0.80-r1.ebuild 1507 BLAKE2B 5ba5dbaeb2446f2079f7d870a3dcd1eb71a67b8e309c0229afda1c334042219bbf6c53c3dc5150866f65618cfc4ce7f5e5ffef7f167d246dc6376338013a7aac SHA512 331d3165e2090abea2cecf36bca266c3be4969efad835a313eb6d69fcdbafd1d27fc17f23c61e4452d738a120c79361011c9569b7458b55b86675940ea3d2290
 EBUILD tgt-1.0.82.ebuild 1510 BLAKE2B 4ec7839b80f5ad63bdbcf59205ea5d3cc4b91f1ec7725ad91de5d20bbb820ff869a325278906c597214ba172149f5bb4909d7297280e049827e34a1677c88124 SHA512 0bcc3fc3e55ae9b7e222fd71eb46da8f84388df1b7cb9f76e7f1bfcfe1d52d5238d0d3fbf5789c64e6292a10bc68338d56a74ece4138990d9fedccccb38cd1f4
+EBUILD tgt-1.0.83.ebuild 1510 BLAKE2B 4ec7839b80f5ad63bdbcf59205ea5d3cc4b91f1ec7725ad91de5d20bbb820ff869a325278906c597214ba172149f5bb4909d7297280e049827e34a1677c88124 SHA512 0bcc3fc3e55ae9b7e222fd71eb46da8f84388df1b7cb9f76e7f1bfcfe1d52d5238d0d3fbf5789c64e6292a10bc68338d56a74ece4138990d9fedccccb38cd1f4
 MISC metadata.xml 749 BLAKE2B 0bc71ded3e2d650bd34edcb3e5515926248ff71354db504d94c548ec951ded4f71e5af1d5127d8fa3a0a3b398204436743d016fbd1cc1e765b6303a8bd734fd8 SHA512 94f7b923adade87a471854f469731094b00872727c7a668ea7e34e558eb87e661ab01c42fbe920a885f28c394f2bc9bf0fba0e48b84893ecade9c3d967e4c2ea
diff --git a/sys-block/tgt/tgt-1.0.83.ebuild b/sys-block/tgt/tgt-1.0.83.ebuild
new file mode 100644
index 000000000000..43d1f60ba296
--- /dev/null
+++ b/sys-block/tgt/tgt-1.0.83.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs systemd
+
+DESCRIPTION="Linux SCSI target framework (tgt)"
+HOMEPAGE="http://stgt.sourceforge.net"
+SRC_URI="https://github.com/fujita/tgt/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="fcoe fcp ibmvio infiniband rbd"
+
+DEPEND="
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	dev-perl/Config-General
+	rbd? ( sys-cluster/ceph )
+	infiniband? ( sys-cluster/rdma-core )
+"
+RDEPEND="${DEPEND}
+	dev-libs/libaio
+	sys-apps/sg3_utils"
+
+pkg_setup() {
+	tc-export CC
+}
+
+src_prepare() {
+	default
+	sed -i -e 's:\($(CC)\) $^:\1 $(LDFLAGS) $^:' usr/Makefile || die
+	# make sure xml docs are generated before trying to install them
+	sed -i -e "s@install: @& all @g" doc/Makefile || die
+	sed -i -e 's|-Werror||g' usr/Makefile || die
+}
+
+src_compile() {
+	local myconf
+	use ibmvio && myconf="${myconf} IBMVIO=1"
+	use infiniband && myconf="${myconf} ISCSI_RDMA=1"
+	use fcp && myconf="${myconf} FCP=1"
+	use fcoe && myconf="${myconf} FCOE=1"
+	use rbd && myconf="${myconf} CEPH_RBD=1"
+
+	emake -C usr/ KERNELSRC="${KERNEL_DIR}" ISCSI=1 ${myconf}
+	emake -C doc
+}
+
+src_install() {
+	emake  install-programs install-scripts install-doc DESTDIR="${D}" docdir=/usr/share/doc/${PF}
+	newinitd "${FILESDIR}"/tgtd.initd tgtd
+	newconfd "${FILESDIR}"/tgtd.confd tgtd
+	systemd_dounit "${S}"/scripts/tgtd.service
+	dodir /etc/tgt
+	keepdir /etc/tgt
+}
diff --git a/sys-block/whdd/Manifest b/sys-block/whdd/Manifest
index 414c09b57a16..fba2a422bc8e 100644
--- a/sys-block/whdd/Manifest
+++ b/sys-block/whdd/Manifest
@@ -1,5 +1,3 @@
 DIST whdd-3.0.1-rel.tar.gz 45657 BLAKE2B 9730e61580359c95fc3e3d23540f3b10e75b476e634cce3be744b8849193f43f968f227bdbd25a0c643106c1343b27070c8b51f33278e902ab54991a05eee021 SHA512 6d5d8dad7537118a5915a29a549e18595da1b6ba031f0ca661805ad0033fd48f32804eb307f67e7b31d6002e708ae578a32aff366f3e610ab36b25f0a4e50803
-DIST whdd-3.0.1.tar.gz 45671 BLAKE2B f16bcfc09356f43b5ae303e007cc3f0930316c67aa3c8622ffc7a3f6ee0f1c5339d7ff32e9b4707a42388fc955f70bf7d3ccc4bd36082d5592a5852d646832c7 SHA512 2cc207d5f0e5da1018ce4ec46f369cdd5c3ed2e55c063f583f8ca68f37949265d4ed8b6ea3ff9133a44cf254a95c3e819ba90f9d822aa3bc2f994cb16d0dc877
-EBUILD whdd-3.0.1-r1.ebuild 638 BLAKE2B 87887c8dcbaed76cf5047501f6ec4066ac3338b114a0328fc89c6b81ca74633a255112b34ab5e274b260d3b6110aacfec40258c3e443a700f26e74d419b03958 SHA512 6c19872765434979c4b4faa901cf0d6392dcbdc155873c432d02b6514a8cca90a5cbfdd8e9ebd05c880f0624dbf66558ad20c1139e6fa35115c82dbda6bf4031
-EBUILD whdd-3.0.1-r2.ebuild 629 BLAKE2B a52c2309d5105a7dd8a5dfa287b73998c3439453bd25db9f0945f1e34608fd28e29836a7ee6bb6513fd6d8b4cb0e8f81d777928932a61dac84d90c6ab3e223a3 SHA512 60ce6a79845e674498775e40f1087a07a354d3a6bb8decae4e203879720d1ba10cdccff97ac06fe42a632e6d646876d7cd46d2b64dd576dcc3a87617e42c85d3
+EBUILD whdd-3.0.1-r2.ebuild 628 BLAKE2B 68cb7e2705887583bc86581ebaac810329fa29ae5103547c0d33db909290d43322093619f80638691d6c3015aef5429ee507e354d0bf40c23439808ece43beba SHA512 13ff6a121131349f7e2fad9eeb86ef8869c6c00a4ddd375dfac6163b22e572181b646b35f5a8f609dddef9d907a9ea4cbac00f344e78625d1a9817a91f08e544
 MISC metadata.xml 320 BLAKE2B 45eeb9de5a78b1f044939348f2fb7e0befb2a3fe2aa66da3dbe30c122c64c105142ba44bfec78e2d760b5a8a185698dc5389bb8f3d9f644dd5c0ee686bd882ec SHA512 ecefce54584273fc6fc699534fc671aa361542c72f0525e779da25180b843b9ee6eb42f467097c3d06b7da200575ac9bdc2c8e1af26e02a6b89f6e7c40a65a16
diff --git a/sys-block/whdd/whdd-3.0.1-r1.ebuild b/sys-block/whdd/whdd-3.0.1-r1.ebuild
deleted file mode 100644
index f096397d84b6..000000000000
--- a/sys-block/whdd/whdd-3.0.1-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Diagnostic and recovery tool for block devices"
-HOMEPAGE="https://whdd.github.io"
-
-inherit toolchain-funcs
-
-if [[ ${PV} == 9999 ]]
-then
-	EGIT_REPO_URI="https://github.com/${PN}/${PN}"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 x86"
-	inherit vcs-snapshot
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	dev-util/dialog:=
-	sys-libs/ncurses:=[unicode(+)]"
-RDEPEND="${DEPEND}
-	sys-apps/smartmontools"
-
-src_compile() {
-	tc-export CC
-	default
-}
diff --git a/sys-block/whdd/whdd-3.0.1-r2.ebuild b/sys-block/whdd/whdd-3.0.1-r2.ebuild
index 7c5517686a86..eadfaf945d92 100644
--- a/sys-block/whdd/whdd-3.0.1-r2.ebuild
+++ b/sys-block/whdd/whdd-3.0.1-r2.ebuild
@@ -14,7 +14,7 @@ then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}-rel.tar.gz"
-	KEYWORDS="~amd64 ~riscv ~x86"
+	KEYWORDS="amd64 ~riscv ~x86"
 fi
 
 LICENSE="GPL-3"
author	V3n3RiX <venerix@koprulu.sector>	2022-06-29 12:04:12 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2022-06-29 12:04:12 +0100
commit	0f558761aa2dee1017b4751e4017205e015a9560 (patch)
tree	037df795519468a25d9362b4e95cdaeb84eb1cf9 /sys-block
parent	752d6256e5204b958b0ef7905675a940b5e9172f (diff)