gentoo resync : 12.05.2022

25 files changed, 193 insertions, 229 deletions

diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz
index db0ec68e3de7..76abdb1b2d5f 100644
--- a/sys-block/Manifest.gz
+++ b/sys-block/Manifest.gz
diff --git a/sys-block/arcconf/Manifest b/sys-block/arcconf/Manifest
index 7e679764154c..0c6268d160c3 100644
--- a/sys-block/arcconf/Manifest
+++ b/sys-block/arcconf/Manifest
@@ -1,5 +1,7 @@
 DIST arcconf_v2_01_22270.zip 47168976 BLAKE2B 95693a1408e5a4d0d638bbf265f2e1e64247dfec2b1078b56860c5fcd4b13ffa5967bfb9967abfd4b79c788aaeb20759b3a9070a84b083c1653e4868a96ac4cf SHA512 0f91a697c44ea0c0561bec9e432e7d4eba8eb8a2b0255a9867bdb183f81e745aee1dcc2b0017847803dbb27f55cad3e985f4bcd3a202c52f5b557fb724e94d9e
 DIST arcconf_v3_07_23971.zip 99777386 BLAKE2B 2fa5e5af1148d1aa67281af927cc9e158f85ffadcd49158adcd9dbb36b1a2c7b7607e68f44b5d2dc1e0ca80d7a0d64c447b93cffa048a03438a4473fefdc06e6 SHA512 09fc72931471c146ad6d5261efe15e2ede24198a16e554cc916bc30e775f592bd9ee476aaacace4df51504580aba03c52b30f5ebb133b410bddec3ccb330fddb
+DIST arcconf_v4_01_24763.zip 48927178 BLAKE2B d3af421390278097d45d22f3544946be032331f3bdb37f07737e5e353d24b5682ec5585f7b8d72c58ce74fce7914c337b7b60035f16faf5191c096a50d7f8489 SHA512 44198741ecbb8e090900e0130ac981d40462fdca75af5452a5a20e9b9e9bf76836922eb03d4f3df0a7219cacbbf62d0ee9c1628fb94e0415e3923c6ecb85bf35
 EBUILD arcconf-2.01.22270-r2.ebuild 975 BLAKE2B e2f313e3c7721bca366a9674e722da307f4206a28b32c04d671cc99b06d7ffb942046c05a4cd93636fb1cda6eae09c87c7753797bde6e8d76b422f44ae9371bc SHA512 7a9912a80d62e5456e60c6627ac49f67dd95ea67a9b1c54dd1568e669eb9e7c81d6f548dec7cec2915e205cdcc17bbe6fde3c2e14f6953b5993bf89d28fed56a
 EBUILD arcconf-3.07.23971-r1.ebuild 831 BLAKE2B 1d408645eaef3f66a7262721f2239a2259fe0a9ecef7035b7625ea70357ab1e1da2df05704f3b66f00b1e7d997bd6a8b7af380cc2c5e714ec20191d3b7b9b655 SHA512 7f7bd0c44c35acf773b6c3b8d8c0f0f5b99b34e811d1d78c7a5bd5ad9fbf5b0a8e44041fc6b60c60e754c37bd29f7f3432acb993da177fe12c851d932f399873
+EBUILD arcconf-4.01.24763.ebuild 830 BLAKE2B 5f74d59d3235361c6e11f2f51aff90518cd7e27e7cf610c7463aa85c43c289f91f369f4843e86a21ee7c7afa1e5fe9228040616f63c1252fb820431870484d3f SHA512 55cbf71176d3673015adf59fc46a331297fa2286149cffa47a7f6958754f6a1bab1a9c20235c7942b1dde82df4465c088ac8b70148b2ccb4d92c6b3e1551f0ee
 MISC metadata.xml 820 BLAKE2B 09a6ab9403b4fc8b3687e6c8e11e5c9326e669427fe66d242897f6d8f8419e5f539b1b8c504c063bd93f35c5eca5da0de0ce118418ef3c42891cdb48d3f61937 SHA512 3e8e83d3949897c4b943affe5fbbf646990f28d9861fd8b6b9a5b276b71494baf552efd99a385f434c76d0f68f7e00cfb9a03951330ff6aa171299a30cf736d4
diff --git a/sys-block/arcconf/arcconf-4.01.24763.ebuild b/sys-block/arcconf/arcconf-4.01.24763.ebuild
new file mode 100644
index 000000000000..b10ef58c73e3
--- /dev/null
+++ b/sys-block/arcconf/arcconf-4.01.24763.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PV="v${PV//./_}"
+
+inherit linux-info
+
+DESCRIPTION="Microsemi Adaptec RAID Controller Command Line Utility"
+HOMEPAGE="https://www.microsemi.com/"
+SRC_URI="http://download.adaptec.com/raid/storage_manager/${PN}_${MY_PV}.zip"
+S="${WORKDIR}/linux_64"
+
+LICENSE="Microsemi"
+SLOT="0"
+KEYWORDS="-* amd64"
+
+BDEPEND="app-arch/unzip"
+
+RESTRICT="mirror bindist"
+
+QA_PREBUILT="usr/bin/arcconf"
+
+pkg_setup() {
+	# CONFIG_HARDENED_USERCOPY_PAGESPAN makes ARCCONF segault
+	# LEGACY_VSYSCALL_NONE makes ARCCONF segaultmakes ARCCONF segault
+	if linux-info_get_any_version && linux_config_src_exists; then
+		CONFIG_CHECK="!HARDENED_USERCOPY_PAGESPAN !LEGACY_VSYSCALL_NONE"
+		check_extra_config
+	fi
+}
+
+src_install() {
+	dobin arcconf
+}
diff --git a/sys-block/buffer/Manifest b/sys-block/buffer/Manifest
index c47f161b2d79..1feb92703572 100644
--- a/sys-block/buffer/Manifest
+++ b/sys-block/buffer/Manifest
@@ -1,4 +1,4 @@
 DIST buffer_1.19-12.debian.tar.xz 9924 BLAKE2B 9f6591e00d596257956e3230cbdf8e58392aa3666d7900c30ea26d103f03d25071ff1033fa72e7be799021ed4c32d43e0e5ad69d1457a5ee22c33e3ae6f8c058 SHA512 3bc9d8c281268d38c1cc3ac40727d747c91b605fc3128e285d24663f97396292a0ec40ede9205702793b5d090c4e172b0df28321921b000aa0fdcb2660319367
 DIST buffer_1.19.orig.tar.gz 17753 BLAKE2B 68e2026f29cb00c48c8f3638d97adeeee0d194d7a6db96cbded251b3f97d36ba2ac32a60660df8aa1d2c7b79dd774b543d3a460a5d76ab6ca408606a013b5648 SHA512 b724d8c3e21f29890659c95a61db8667846e49614455411995160bc8d5af8a37af91465ad5d882e6bd7883dbd7886215a8c1d530f7392c98cdcead4f4377aa7f
-EBUILD buffer-1.19-r4.ebuild 1209 BLAKE2B 68ed16e51abfd72cb0d5e3b8e4efa8101525487a990051cf1c3331b9f9304b785e7d228f313489c1be7097ccdffd59ed3c4b5b2c109e9e4b09fabd518442914b SHA512 d71e593a13b06fffa9a27a439ad4890349be4735d415d8e6527a38698a9a70c2b9def9eab8fc0fd1e4130bc1e9723d32c1abf9da9e5c7291e4d6c237ca4f2b4f
+EBUILD buffer-1.19-r4.ebuild 1216 BLAKE2B e61349e85ec43dc29d641a01de70b6379c062d476370292483260aae72458dc6a6362b118ae1710d389ca87c9166842ffb9dd8221cf905f41712e7b43b885b7b SHA512 8bb3640a78a21d49bd5b6699610287448785481a6a108f552d6b3285d89e0a35658691a281888a54f2226a37b0a2e5f45bf790eda017387d6795292f4b0f0ac3
 MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c
diff --git a/sys-block/buffer/buffer-1.19-r4.ebuild b/sys-block/buffer/buffer-1.19-r4.ebuild
index d8809b3855b8..170485b21dcb 100644
--- a/sys-block/buffer/buffer-1.19-r4.ebuild
+++ b/sys-block/buffer/buffer-1.19-r4.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
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ppc sparc x86"
+KEYWORDS="amd64 arm ~arm64 ppc sparc x86"
 
 src_prepare() {
 	local f
diff --git a/sys-block/gparted/Manifest b/sys-block/gparted/Manifest
index c7c5db8af5e0..dc708c7b9554 100644
--- a/sys-block/gparted/Manifest
+++ b/sys-block/gparted/Manifest
@@ -1,5 +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
 DIST gparted-1.4.0.tar.gz 4308426 BLAKE2B 834782196e7cfe5c5553200743cbbaf700e59ef01076919d16138e736ebbbb16185ec68cd27546f1ff851ff742c51fc170a0f6596e9b014684b8be1d29acfea9 SHA512 20f94622fc1a2727f1fc9bb39ea9f04f14af06b0ff7e47c2149730d5eb339089b0d3c21cd3c9ce6f971e955a9f6ab89cc32fd5b7545a5e340b451297d87e8f39
-EBUILD gparted-1.3.1.ebuild 2749 BLAKE2B 8e39e13a04028fe6d9f19088df2daf5b157c8a2df61eee43d0fbe6ab0b6e3d8edbd209b71418feaa4164e712647af6abb272314ce9f8f33b59a4d5d00965796c SHA512 d911cae15189272fb991b2dbc98da7528bc7fc8f75b21dd41baefd397c223e7aabdd92804945e466e26f825cd90ed5b1630f02e271a02415e712b88f2213aad3
-EBUILD gparted-1.4.0.ebuild 2760 BLAKE2B 6e889dd2da616b33a965150add96787031687a099557dd865c4a2bf430ef9fcf6e812748c455e57791155b2fda2b48c7eb49271f0d15c131217b463ea6cf9d4d SHA512 c22889177f0f9a28f157df8a334cb5bb8c27234190a9945c86ac168a9e1c4fe9deb04681a4007463e5d1956bc98ff3bedc80e0c8b02854794a775807291de0d9
+EBUILD gparted-1.3.1.ebuild 2808 BLAKE2B cc84d49cb77db5bf0b582e3bce8cf280c5cdffd378c7a5ae266930ec6fd1bf69dd2a41bc91bc403decab2638800f9a3dddc97be7e173a3842fe8d864bd063358 SHA512 4f4b19616bcc9e5158114e28a86452f0fd5a7d32dd0eb6144ae6a6b290de4ffcf614f916066df6adf916ad15fede72c0ba5de73ffb5b9715372144922de0e811
+EBUILD gparted-1.4.0.ebuild 2819 BLAKE2B 092bdc7b8c454344176701edb934ff556a40d480a8210f394e2246ba460cce2846fb32f97c3fdddda99f0cebe02dc25310b676bf7809e8c97c06a396d70ed38e SHA512 4fd82d8f29e739fe1b2874dc336b10153bcc8699785dc8441f7ca462b35dbaa9b3bdcc25ae4fab2cd2f9bc4b440d7fcaf81968cc800ce848112cb5470580f5d1
 MISC metadata.xml 915 BLAKE2B 0d1b9e847455a3920c9826b8f352481448aa08b6a7625db5d19da403b5d20dcf4dcc78a9b7a3925fe06915a5078979668028c7c1e8da869a3f9d493fed22d2cb SHA512 7df8fd771da273681728e142d7e6ef10b5434dd40ac96eb2da96c1331116dbc33c7a25be5ca69dd8a56d3eb4ed961d4a51d4f0c554b44e5752169b0f5b9d2e8a
diff --git a/sys-block/gparted/files/gparted-1.3.1-musl-nullptr.patch b/sys-block/gparted/files/gparted-1.3.1-musl-nullptr.patch
new file mode 100644
index 000000000000..2a4f648db609
--- /dev/null
+++ b/sys-block/gparted/files/gparted-1.3.1-musl-nullptr.patch
@@ -0,0 +1,51 @@
+https://gitlab.gnome.org/GNOME/gparted/-/commit/3d4b1c1e7b33f229efd254fb0cc06660af627ea0
+https://bugs.gentoo.org/838466
+
+From: Dominika Liberda <ja@sdomi.pl>
+Date: Sun, 10 Apr 2022 21:09:56 +0200
+Subject: [PATCH] Fix NULL == 0 assumption in call to ped_partition_flag_next()
+ (!100)
+
+GParted fails to build on Alpine Linux Edge (development tree for the
+next release) like this:
+
+    GParted_Core.cc: In constructor 'GParted::GParted_Core::GParted_Core()':
+    GParted_Core.cc:75:64: error: invalid 'static_cast' from type 'std::nullptr_t' to type 'PedPartitionFlag'
+       75 |     for ( PedPartitionFlag flag = ped_partition_flag_next( static_cast<PedPartitionFlag>( NULL ) ) ;
+          |                                                            ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The code is failing to compile now because musl libc 1.2.3 has became
+more C++11 strict [1][2] by defining NULL [3] as nullptr [4] rather than
+as 0.  The parameter to ped_partition_flag_next() [5] should always have
+been numeral 0 cast to an enumeration and never the NULL pointer.
+
+Fixes this commit [6] from 2004-12-27 which changed the parameter from 0
+to NULL.
+
+[1] define NULL as nullptr when used in C++11 or later
+    https://git.musl-libc.org/cgit/musl/commit?id=98e688a9da5e7b2925dda17a2d6820dddf1fb28
+[2] NULL vs nullptr (Why was it replaced?) [duplicate]
+    https://stackoverflow.com/questions/20509734/null-vs-nullptr-why-was-it-replaced
+[3] C++ reference, NULL
+    https://en.cppreference.com/w/cpp/types/NULL
+[4] C++ reference, nullptr
+    https://en.cppreference.com/w/cpp/language/nullptr
+[5] libparted Documentation, ped_partition_flag_next()
+    https://www.gnu.org/software/parted/api/group__PedPartition.html#g0ce9ce4247b320011bc8e9d957c8cdbb
+[6] Added cylsize to Device and made Operation contain a Device instead
+    commit 174f0cff77c5799a713954a22b2c54306d03036c
+
+Closes !100 - Fix NULL == 0 assumption in call to
+              ped_partition_flag_next()
+--- a/src/GParted_Core.cc
++++ b/src/GParted_Core.cc
+@@ -72,7 +72,7 @@ GParted_Core::GParted_Core()
+ 	ped_exception_set_handler( ped_exception_handler ) ; 
+ 
+ 	//get valid flags ...
+-	for ( PedPartitionFlag flag = ped_partition_flag_next( static_cast<PedPartitionFlag>( NULL ) ) ;
++	for ( PedPartitionFlag flag = ped_partition_flag_next( static_cast<PedPartitionFlag>( 0 ) ) ;
+ 	      flag ;
+ 	      flag = ped_partition_flag_next( flag ) )
+ 		flags .push_back( flag ) ;
+GitLab
diff --git a/sys-block/gparted/gparted-1.3.1.ebuild b/sys-block/gparted/gparted-1.3.1.ebuild
index 1368424f32cc..1119005c1bb3 100644
--- a/sys-block/gparted/gparted-1.3.1.ebuild
+++ b/sys-block/gparted/gparted-1.3.1.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
@@ -35,6 +35,10 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.3.1-musl-nullptr.patch
+)
+
 src_configure() {
 	gnome2_src_configure \
 		--enable-doc \
diff --git a/sys-block/gparted/gparted-1.4.0.ebuild b/sys-block/gparted/gparted-1.4.0.ebuild
index 1a1cd973c18d..a209f0a714db 100644
--- a/sys-block/gparted/gparted-1.4.0.ebuild
+++ b/sys-block/gparted/gparted-1.4.0.ebuild
@@ -35,6 +35,10 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.3.1-musl-nullptr.patch
+)
+
 src_configure() {
 	gnome2_src_configure \
 		--enable-doc \
diff --git a/sys-block/mbuffer/Manifest b/sys-block/mbuffer/Manifest
index 0239e1a84c91..cfa4e4e182b4 100644
--- a/sys-block/mbuffer/Manifest
+++ b/sys-block/mbuffer/Manifest
@@ -1,9 +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-20210829.tgz 148786 BLAKE2B af4d47eab143861a10fa5e9f86cc0066594b675baf37dd63ba71dffb4a22a4bd057ea4a03d50ba210af8c1021dad258a33d46525a11c7cc2ad0dd852839f3b9a SHA512 67b7398c27fb4539d36437b5224a7305216c32af140d5dd9d4af734227bb4bb4c9e8c577e05e315534c5e1cf65a87a9a7a32a212cc4faef17e3c387b3895ef47
 DIST mbuffer-20211018.tgz 149348 BLAKE2B 0b9fbd6b48198cb8def22687420c61ed2e60f7be5ba10365bdc324f4de33c5e1fafdad93c53031d8fb4cb2d2cbb1695e517761eb6859f2f80ffabbeacb4783c9 SHA512 9e08bec5945e7495b469578381d154c2820aed51d1afbf5d0b9bdd693acc095bb4b69e376f5e6a9a8e239f5b9adfcdc7e091d692006248447490ce0547bb7109
 EBUILD mbuffer-20210328.ebuild 1520 BLAKE2B 118ca53f14fbcd0f01b3c1bc6cc75eec9a879c65c3721f1366c3fe1bc18ccb65bfe64f5c4916358ddea8d54a4cb966e6630605172bc3ebad23896c97ce9fc8d0 SHA512 15b13c98138583bbf9046a06d30a84812d661e53cd2ec460f36869d5769185a0cc046883aa0af1b316630c40a75a705e4cd7eaf36f07ff834b4ef9a1dfcbafb6
-EBUILD mbuffer-20210829.ebuild 1525 BLAKE2B 7e679c246ce656064853ec65561a425f0e0d2c74980008e9d1213d72c0320d1b0bd0d3e8b513b45a2e46cd516d9bdbf9eef6eba313ec927e6039e551dafa4399 SHA512 02c9cb2c90a0cf0561704fa688449296182ae3e3e74452013fcc1e719be525e6bb72e36dcc99efb2689e49b3e5672fe4d0e850dfdcb72c04bd589badbf36649c
 EBUILD mbuffer-20211018.ebuild 1525 BLAKE2B 7e679c246ce656064853ec65561a425f0e0d2c74980008e9d1213d72c0320d1b0bd0d3e8b513b45a2e46cd516d9bdbf9eef6eba313ec927e6039e551dafa4399 SHA512 02c9cb2c90a0cf0561704fa688449296182ae3e3e74452013fcc1e719be525e6bb72e36dcc99efb2689e49b3e5672fe4d0e850dfdcb72c04bd589badbf36649c
 MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c
diff --git a/sys-block/mbuffer/mbuffer-20210829.ebuild b/sys-block/mbuffer/mbuffer-20210829.ebuild
deleted file mode 100644
index b5df3c74c1a2..000000000000
--- a/sys-block/mbuffer/mbuffer-20210829.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="M(easuring)buffer is a replacement for buffer with additional functionality"
-HOMEPAGE="https://www.maier-komor.de/mbuffer.html"
-SRC_URI="https://www.maier-komor.de/software/mbuffer/${P}.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
-IUSE="debug ssl test"
-
-REQUIRED_USE="test? ( ssl )"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="ssl? (
-		dev-libs/openssl:0=
-	)"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-20180410-sysconfdir.patch"
-	"${FILESDIR}/${PN}-20200929-find-OBJDUMP.patch"
-)
-
-src_prepare() {
-	ln -s "${DISTDIR}"/${P}.tgz test.tar #258881
-
-	default
-
-	mv configure.in configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable ssl md5)
-		$(use_enable debug)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	if has usersandbox ${FEATURES} || has network-sandbox ${FEATURES}; then
-		ewarn "Some tests may fail with FEATURES=usersandbox or"
-		ewarn "FEATURES=network-sandbox; Skipping tests because"
-		ewarn "test suite would hang forever in such environments!"
-		return 0;
-	fi
-
-	# Enforce MAKEOPTS=-j1 because src_test() spawns multiple listener
-	# using same port and src_install may have problems (with /etc folder)
-	local -x MAKEOPTS=-j1
-
-	default
-}
-
-pkg_postinst() {
-	if ! has_version "app-arch/mt-st"; then
-		elog ""
-		elog "If you want autoloader support you need to install \"app-arch/mt-st\" in addition!"
-	fi
-}
diff --git a/sys-block/ms-sys/Manifest b/sys-block/ms-sys/Manifest
index f9d119ab19b1..f71bbc99f2e9 100644
--- a/sys-block/ms-sys/Manifest
+++ b/sys-block/ms-sys/Manifest
@@ -1,5 +1,3 @@
-DIST ms-sys-2.5.3.tar.gz 76192 BLAKE2B c1046fa346088bb9abd39c8140479e11525fd1965fffebc0ca6ed8da354e354af6946f4bfd2a68ddca1f0b1bbb02ff94216d763a12f4ca43de0cd9ba1aa4d877 SHA512 18080bef903c68b6032e04124f3b3b9f0eb58517b338c6bd795846d786ee0af6b65760166b591090ad865a08a03346675f3c34ce59c64215059dac1439b558d8
 DIST ms-sys-2.7.0.tar.gz 85195 BLAKE2B ae1b6de38bb4ac275f971c7dfbbdc5d32a645ffc0c32a6fa82f6673fa8788f1a328d9609c2e82812fc74b9c94ea980f257297e67b7fb9536c9d42c0fabc26f8f SHA512 d9828c86a5b316cadcc712ea029bcf7322f89ab31424982fe2a7e23cdb2334a5d076c2b58299f1f312b0d4b4c869a3d7ffadf236230344bc2e7b4a72c668510e
-EBUILD ms-sys-2.5.3.ebuild 671 BLAKE2B e092cb6e2d4ccbe1a36740e5982c442672e7bb39c6a2404f976635d24b76241fa71bc93112afd79d424fec257e1493f2ef9f0f93712cede569f63b41fdde102f SHA512 7fbc604a03ddffd88223b99c1914bd122616f0d66069e0349f75e2c1ade798ae683c1de748bae35c5fb4d3be19e50b17a9bba47a060d4ced6b29f78123e2ee0f
 EBUILD ms-sys-2.7.0.ebuild 786 BLAKE2B 5b0d3072602cbd865b90e032ef48c3487053abd5d7becf6c3e1c9b4cb8d0e46d3ea13d9b54c7609cdfaea982081d4c7d3b0aef2983b6747a6573a0069fbc68af SHA512 654b9d3e290baf76fa02424bd09f03c5e0e1fa686f3f120b33f91831c8f18b403e2610efb19488838a49b3311a568ed6cfa15ffe31e0055f2bd3cb4dc166ad3c
 MISC metadata.xml 304 BLAKE2B 664a680cf4696848e156b5e2541ff9aaa65279a4d7517f58df11b8a8f7182740cca13a568e3a126063858620f0a8ee3644cdb8808b3078fd7281dc1e15629cf4 SHA512 5361de62d946f44d10f67ecd5830d69c34f8ec9bbac9a423c3cdc4129f9a249359ef5420201cf3b9c1c45fb115643361ab0d772773ae1351198b790f3c5d6171
diff --git a/sys-block/ms-sys/ms-sys-2.5.3.ebuild b/sys-block/ms-sys/ms-sys-2.5.3.ebuild
deleted file mode 100644
index 7215c91bf1e9..000000000000
--- a/sys-block/ms-sys/ms-sys-2.5.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="A command-line program for writing Microsoft compatible boot records"
-HOMEPAGE="http://ms-sys.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DEPEND="sys-devel/gettext"
-RDEPEND="virtual/libintl"
-
-src_compile() {
-	tc-export CC
-	default
-}
-
-src_install() {
-	local nls=""
-	if ! has sv ${LINGUAS-sv} ; then
-		nls='NLS_FILES='
-	fi
-
-	emake DESTDIR="${D}" MANDIR="/usr/share/man" \
-		PREFIX="/usr" ${nls} install
-
-	dodoc CHANGELOG CONTRIBUTORS FAQ README TODO
-}
diff --git a/sys-block/open-iscsi/Manifest b/sys-block/open-iscsi/Manifest
index b2e4b08eadb4..e368820e1d47 100644
--- a/sys-block/open-iscsi/Manifest
+++ b/sys-block/open-iscsi/Manifest
@@ -6,5 +6,5 @@ AUX open-iscsi-2.1.6-Makefiles.patch 3157 BLAKE2B 160e0c6c85d40bdd12561695dda6db
 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
 EBUILD open-iscsi-2.1.4-r2.ebuild 3995 BLAKE2B cde9eedfd0adce665015ced51a9a6a83c6d4e163ebcd3578c4733b9816829d815db0d0c11a502be52c15a9ec1ea47a4b248a1ed4d44e9939096281b8fc69b0e8 SHA512 7a3fa0b2296478e1fe7b00f73b6aa7dc6117781958835d6e9f038e7b6cd2b22e4ae53c78543addc69bba1079238d7b455260ce825d6ef6792865323202735896
-EBUILD open-iscsi-2.1.6.ebuild 4078 BLAKE2B e63858cff9007270a0bcee0f304225d045c0b9ce4fd95926df0582d94231f3a6d77845419bf0b4b2cdc9281ed24747a7b0d646283c4612e761b787317bfdbc49 SHA512 64973842c34c506f1ea4a2068bf221effe435c707e72e95c44f570fb5fa4833987256371ae2f33f246c9f7046caace4c6cc992d9b0e3dfe5f7280c5a899b3655
+EBUILD open-iscsi-2.1.6-r1.ebuild 3799 BLAKE2B 4f03566c748d8db7db690ec8ec716a7c01d27bc6a646c4348ab590d6e91837b85aa1b388efe2f45382ea2c4437abebd071df9259568ad80e43f0b9424977f9bd SHA512 517b3a2d0e6d262e73569fd0d8ddf2699530c0bf00a6eb7a04ef1a7e46fb25a34079470ed86c53ac38681e9cf9016c228b88c357effa2ee9207ea1ab74d238b6
 MISC metadata.xml 532 BLAKE2B 201e4a44b240ad6ba1096927924ef8c84027f092ffed238db0d92cce1fe8f37e4c927dc1f8ae8393578cf66831df2c2590409349b980edb09e5187ac4369aad0 SHA512 67ed8a95407e6cce2fbfc35a6b0df99586eff99ec51f41666de298739f233282cad15c4d9d73fb42d3d2972f85da274fe47699c87f8ba2ccc44a841d563087f4
diff --git a/sys-block/open-iscsi/open-iscsi-2.1.6.ebuild b/sys-block/open-iscsi/open-iscsi-2.1.6-r1.ebuild
index 8dd972425a4e..576fdc85f330 100644
--- a/sys-block/open-iscsi/open-iscsi-2.1.6.ebuild
+++ b/sys-block/open-iscsi/open-iscsi-2.1.6-r1.ebuild
@@ -69,10 +69,6 @@ pkg_setup() {
 }
 
 src_prepare() {
-	sed -e 's:^\(iscsid.startup\)\s*=.*:\1 = /usr/sbin/iscsid:' \
-		-i etc/iscsid.conf || die
-	sed -e '/[^usr]\/sbin/s@\(/sbin/\)@/usr\1@' \
-		-i etc/systemd/iscsi* || die
 	default
 
 	pushd iscsiuio >/dev/null || die
@@ -98,7 +94,12 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR="${ED}" sbindir="/usr/sbin" SED="${EPREFIX}/bin/sed" install
+	emake \
+		DESTDIR="${ED}" \
+		sbindir="/usr/sbin" \
+		SED="${EPREFIX}/bin/sed" \
+		systemddir="$(systemd_get_utildir)" \
+		install install_systemd
 
 	# Upstream make is not deterministic, per bug #601514
 	rm -f "${ED}"/etc/initiatorname.iscsi
@@ -114,16 +115,6 @@ src_install() {
 	newconfd "${FILESDIR}"/iscsid-conf.d iscsid
 	newinitd "${FILESDIR}"/iscsid-init.d iscsid
 
-	local unit
-	local units=(
-		iscsi{,-init}.service
-		iscsid.{service,socket}
-		iscsiuio.{service,socket}
-	)
-	for unit in ${units[@]} ; do
-		systemd_dounit etc/systemd/${unit}
-	done
-
 	keepdir /var/db/iscsi
 	fperms 700 /var/db/iscsi
 	fperms 600 /etc/iscsi/iscsid.conf
diff --git a/sys-block/parted/Manifest b/sys-block/parted/Manifest
index 5967d1809887..a100dd7a7039 100644
--- a/sys-block/parted/Manifest
+++ b/sys-block/parted/Manifest
@@ -3,5 +3,8 @@ AUX parted-3.3-atari.patch 421 BLAKE2B 9048176f882e66cf89cc2d79aa0ea7a550f9c649d
 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
 MISC metadata.xml 887 BLAKE2B 04b4f255209a5d1c26fe4d84eb6a2d0fe7b87ff30fb2cb0425685c277eecbc498a7886ec328fdf2456bc02af4d787cd7eed16e2a9a02c5b8ef8f146d3c551d77 SHA512 6cacc6560766381699e0c46241a9446260e984a78eb9c8d39486e699d4880e2ae712b199b628a3fcdfe9cd98cfe18b47198675e8546cf84d89fbe464e2ab1997
diff --git a/sys-block/parted/parted-3.5.ebuild b/sys-block/parted/parted-3.5.ebuild
new file mode 100644
index 000000000000..0f5b5f649c82
--- /dev/null
+++ b/sys-block/parted/parted-3.5.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/bcl.asc
+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
+"
+
+DOCS=(
+	AUTHORS BUGS ChangeLog NEWS README THANKS TODO doc/{API,FAT,USER.jp}
+)
+
+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}"/${PN}-3.4-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[@]}"
+}
+
+src_install() {
+	default
+
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/sys-block/partitionmanager/Manifest b/sys-block/partitionmanager/Manifest
index d1c00a01f157..40d18dfa2662 100644
--- a/sys-block/partitionmanager/Manifest
+++ b/sys-block/partitionmanager/Manifest
@@ -1,5 +1,5 @@
-DIST partitionmanager-21.08.3.tar.xz 2098484 BLAKE2B b430f94875d4139e76358c63f945d95ead216e4179396fd2a2f83ac38975c312137d583376fd1d417bc34c4b437d0c99b1cc5af75e046de33a66bb10e5c45953 SHA512 79d5465ba7635a80e5afd4d1240c5dbeb5469003e8b8f0731bd3a88a8fa0ff3ee8a2d01b02ef661732f4bd89c06e9f461c726435e8dc60155338f1b44fee49c1
 DIST partitionmanager-21.12.3.tar.xz 2098684 BLAKE2B 3a6301a1bdd3187853528e0e43d5f22576acf3386bacaaf48386f7db2c9f4de2ff657f4b08a46acc67a9aeb686be411af1f25f693a3326e955093199cd255ca0 SHA512 3d85b323b8c00f17b3dfe7de3b4654e21c5ebb9d166aa9ef7929e12533a5568bfe92bcddc746c639852103df3b6a4bec975813867857d6f0bff3aef35d8665f3
-EBUILD partitionmanager-21.08.3.ebuild 930 BLAKE2B ef01432ead0cf2d1e0f36d41e17bc8e5dc1783d7afc5c49354d728b3b6ad902da933ef5dfabca213101ab42846603c8fa580d261d07bd727120753e205a2a4c7 SHA512 b6f6def3b1c6a5435593b01f5b363d176b57a57482cf1c4558aa99e4e9da81e80a7494ecf2a71216ebd1ff2007eb4691ef78267047fd70abc4240bcff3cb425c
-EBUILD partitionmanager-21.12.3.ebuild 931 BLAKE2B 014ffb18de7e469092135303f2f090d3f7cec3773fd53da0578f7b620376cbade27b9610d19c7cb8211965ed357e027bd281849d17b39d9c037895d280999234 SHA512 11bef8a684f3ebb4e43973f2275e86f62c80b16f80f064b7e6b51de2713d772c397c0977c5ed3e45eb7cca8d68e16af25dfbce50c1b1fcecec58a565293bad8d
+DIST partitionmanager-22.04.0.tar.xz 2111220 BLAKE2B 2464a841927007a6ca3d82733362e8d8f3cb781fc8908f4d58988ebaae546ab710ac172b62c129534746aacaf46c781b4a96d99f6361f58e8cb5a05c83ac4b45 SHA512 674fc394a694d282b9633ec71b4e2a83fab0c080c163a20766bf3b526e35e2c8393c5a8fef67c274e623d48a186c89a82df8083bf4672d266d95374ba9a69f26
+EBUILD partitionmanager-21.12.3.ebuild 930 BLAKE2B 05aaf06fe3a21e898bc25a51a7f3e28cbd431623fe45bc5a9deef334fb2ae62dc9e14a6971a3d4aeeeb4677769d543a08c154df029a7668039c64c27f3938132 SHA512 feec4a7aa7dea7478228d83fe624499a9f87b4f402ebd23a018a26114d3d7f657af804f41298223fc85e45a864c43e773981732c86b85f5de98023fb9d492ded
+EBUILD partitionmanager-22.04.0.ebuild 953 BLAKE2B 508be465c3177cfec9c2847db071649abb1be646feef2e1ab28bba8d153d87bd437c89fe535a87ee6ae62de1b9f2ed04ad70396880301956e443a1d61eb0fb3b SHA512 34a727b742ea0462382a6cce08c7fedc699f52459902b33faf157eb52d1232e3a40451952c4cbd31b19966a63830d1cdf20369d995f388c310e607904480828f
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/sys-block/partitionmanager/partitionmanager-21.12.3.ebuild b/sys-block/partitionmanager/partitionmanager-21.12.3.ebuild
index 874e482f5da6..cb15e15efb4d 100644
--- a/sys-block/partitionmanager/partitionmanager-21.12.3.ebuild
+++ b/sys-block/partitionmanager/partitionmanager-21.12.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/partitionmanager/"
 
 LICENSE="GPL-3"
 SLOT="5"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/sys-block/partitionmanager/partitionmanager-21.08.3.ebuild b/sys-block/partitionmanager/partitionmanager-22.04.0.ebuild
index 5df5b8bd38ca..f6356d0eae43 100644
--- a/sys-block/partitionmanager/partitionmanager-21.08.3.ebuild
+++ b/sys-block/partitionmanager/partitionmanager-22.04.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 ECM_HANDBOOK="optional"
 KDE_GEAR="true"
-KFMIN=5.84.0
+KFMIN=5.92.0
 PVCUT=$(ver_cut 1-3)
 QTMIN=5.15.2
 inherit ecm kde.org
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/partitionmanager/"
 
 LICENSE="GPL-3"
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 DEPEND="
@@ -31,6 +31,7 @@ DEPEND="
 	>=kde-frameworks/kjobwidgets-${KFMIN}:5
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	sys-auth/polkit-qt
 	>=sys-libs/kpmcore-${PVCUT}:5=
 "
 RDEPEND="${DEPEND}"
diff --git a/sys-block/targetcli-fb/Manifest b/sys-block/targetcli-fb/Manifest
index de8188c2a528..4f48bc51505e 100644
--- a/sys-block/targetcli-fb/Manifest
+++ b/sys-block/targetcli-fb/Manifest
@@ -1,5 +1,3 @@
-DIST targetcli-fb-2.1.53.tar.gz 39586 BLAKE2B 35e5cea72580ba26b8397027e92446c129af5a94ab9458eed63ec731289065bcce759a77558a022c41b4ed73eefe865000e60b4e17816836f13056cb07071069 SHA512 acefa7f8df8ee901cae8f04cbeb264d6024100e2d8b8343024bc52842af88a23d1bf5dd880ff2c77046bd8da8493630b4e357103617c02d1a90947e42c3a7c92
 DIST targetcli-fb-2.1.54.tar.gz 39565 BLAKE2B 6eeb7da39fb047f9123fe12ea92a41d8e6fbd6728fdde8e1315e0c0224ad8abfa29df798680949d89cad6ff5afcac8112bbcc63b019f6245eff12089ea7b64d3 SHA512 dd008b8c47acc095078454c94b0c6f19ba88f86ddf1b5335eb050abf61d89ce1ffb7411ff3a174de60ed9759e6337206253aa9b2def6497b85c884a0a111308d
-EBUILD targetcli-fb-2.1.53.ebuild 722 BLAKE2B 3bf4c7bec7c29dd77a2b5932c8c0404f203682badf9ee584328be1fb5856e5edbac312709ca51c1c761b89e46267b5bd19cf04dc45ddbe0c96a80eb95e60d16e SHA512 dd69231c84a1efb39996e0f8288e07610c3564eff60a3e6d69857ed0aac485fbd65ecaff33f3f372d3eddd8dad0f0cfb1085fe608c663c8d154c928604b4d7e5
 EBUILD targetcli-fb-2.1.54.ebuild 782 BLAKE2B 344e6eecf56106b9a10af722f588042d89c3717b3bd1fab65ab67b826506bd68d06b16035a6297c5f6b9421619a38ecd23c05a2989d55160d644dc963c8d702c SHA512 654a345a5dbdb30b327a886b8c71417422651e627bf0adc635592e40e31852c5f68da6621973e3a28e6e7f7b724ec4d3a42c86e16ae0bede0d41a8b659c700a9
 MISC metadata.xml 545 BLAKE2B 91984af1bb12eab76b905c53a959f7e2ecd9ed40cacc4dae6a4917a69dc51a77408d78103a30f34ff1005b7143cbf480327b3d42ceca98d993ace4077ce50ed3 SHA512 06d26aad9c2ed8a9725fd5395415bba476b150c817aee39fb56aa456e2f36dd59449255b4e9250d0745895eaeb0df286538ba13eaf4e9f6bb83ed198dd0fe6b2
diff --git a/sys-block/targetcli-fb/targetcli-fb-2.1.53.ebuild b/sys-block/targetcli-fb/targetcli-fb-2.1.53.ebuild
deleted file mode 100644
index e4c4816ab706..000000000000
--- a/sys-block/targetcli-fb/targetcli-fb-2.1.53.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-inherit distutils-r1
-
-DESCRIPTION="Command shell for managing Linux LIO kernel target"
-HOMEPAGE="https://github.com/open-iscsi/targetcli-fb"
-SRC_URI="https://github.com/open-iscsi/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="dev-python/configshell-fb[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	>=dev-python/rtslib-fb-2.1.73[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	sys-apps/dbus"
-
-src_install() {
-	distutils-r1_src_install
-
-	keepdir /etc/target /etc/target/backup
-	doman targetcli.8
-}
diff --git a/sys-block/thin-provisioning-tools/Manifest b/sys-block/thin-provisioning-tools/Manifest
index 82bc827765ef..16c4dbf614c1 100644
--- a/sys-block/thin-provisioning-tools/Manifest
+++ b/sys-block/thin-provisioning-tools/Manifest
@@ -1,8 +1,6 @@
 AUX 0.9.0-remove-boost_iostreams.patch 300 BLAKE2B 05ebeb2a34c0c22be1d743af65ed9d2b4533e5a72034f818dd3c691aa66796b6fef41fc320e1f1d8ec21fa687752a15486e3b0716bfd67fc169cb72b3400ed31 SHA512 baced99272969395b0c5698435d22df4a2ca9ee0eec7848e918cab5bd0832a0fd73d95bf199c795c9647ce7d46d1f62e54f60d69b7e452821fd6cca9b808bc7b
 AUX thin-provisioning-tools-0.7.0-build-fixes.patch 1077 BLAKE2B 540efcaff8a0f826f132aa06b5d63728d5b7e0de2da81ff65480537c10b4a769330f0e557496f1ce6116cce51b834057ffb6c967fb527deb419aee4d1f3d2ec5 SHA512 fbdf778774bca2e608bbab7696b6646c64ee740c40c743f40f28e7e360fc2a6c6c3752992d9d5f7bbb624a9240ba480a6e58a7c5956ba6d2b772ece18502afe7
-DIST thin-provisioning-tools-0.7.0.tar.gz 230595 BLAKE2B 00238a682f80600e3a5bb6d0d2a9662bd0fd3ae5404d5895427f169640b469780f554c22c6a93187058e6399c76ba14a6fa8d73f2bb09aa79927dd458b58ffa9 SHA512 cb6c44c7215aadd72292d73e2374d8c0c28566adcb10c7a3de83576dbd28649ebba6e2cc59945a28921e423540969cb21f648c37e375d68f48e56a8be4a4c7b8
 DIST thin-provisioning-tools-0.9.0.tar.gz 500998 BLAKE2B ac269fb6dfd1baf1572da27582ac2cd763b07aaac130a9467d05581e7a0ba1309d7dbf4c6095407111667e57af2e8183318d558ed23853f9c84b9c151c0878d9 SHA512 e1796fb3948847d72ca8247cae58017507c0a847a00201b93668eeb8fbfea4107c4c2affa5c211c149798a89b10474e83d2bd61a5545a668299be97aed591e0f
-EBUILD thin-provisioning-tools-0.7.0.ebuild 1288 BLAKE2B fe429bd318ab608b2161086cff3015440fd1feeaa21c03fe86c330a1045ab3c9a6efbddb6a5d414faa31757b81643299608b77fad174be8a1560523d6c8e857d SHA512 75e81c6096febf78c05d6cf9c7b9e1fb12975f5685742cd9ae48b4311343041e7af48325e6b13224c854b78882f879ede476fc915215a574d21872d846cc829e
-EBUILD thin-provisioning-tools-0.9.0-r1.ebuild 1561 BLAKE2B c03ce00a1252d1102c8adb3a0796ba22b1bc82667dbc95c24d8b29f48fadaa62316713e713e640ac4bbf7cb6f676ce3c26fbdad3193fbf677394a50ddbb5b3c1 SHA512 cee079ccc2315c9dfe9c1532a5c55c396c4318515f158e3e763a738e47bc59d57d37a83dd919fc865a514d915fef526600b1916be073989fbe5e4dd1e896fd07
+EBUILD thin-provisioning-tools-0.9.0-r1.ebuild 1568 BLAKE2B 3e1e31a2a056187870750d1ca5f4eebcd17b9bb4ffa52bee71ff7bc362db0b5d5827b329c9c92799a1d17a0b8d8f4da2ab9110585377989ed009428daa818fc0 SHA512 325ef356e65b5ef6beeacb705358b9917a3461eaa5c154c658c974f45e21b246e709ef2a8c67ddcee4a2a5aa7a87876127650352d860c88ab99d28afa584ca13
 EBUILD thin-provisioning-tools-9999.ebuild 1513 BLAKE2B e96e3b15a980ec75e4ba1fdefbe6e5fcdb0595a11ec73e165b58acfec7e1e85e31755054325d82d0883f51f63bcd9fe366405e0c3ed4b878f9fc04752f5f2934 SHA512 7c33894d4b96487a91be560db7b43bdd08833ba7fc56173b4e6fc2368a6f1939f7c32f861ce1741c2329bf91a2616ff29d7c3349f6614d559a3611c05899d12f
 MISC metadata.xml 435 BLAKE2B 158935bdfedea370ca481492bd55c0de5c21e8dc3ecc56bf0428459b11ea624c23d2e050557d84f06eeac019acfba806997e9600f29ed13f27c523c13c0b57cb SHA512 fba525dba8ae7985731ef7542a248e9a4fffae4d511488a162174ccf24dcfcc96e312c1ea56754252595bd63513063c22312d33aef83b5b89c2279139539d128
diff --git a/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.7.0.ebuild b/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.7.0.ebuild
deleted file mode 100644
index 53bf5146d42e..000000000000
--- a/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.7.0.ebuild
+++ /dev/null
@@ -1,59 +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
-
-DESCRIPTION="A suite of tools for thin provisioning on Linux"
-HOMEPAGE="https://github.com/jthornber/thin-provisioning-tools"
-SRC_URI="https://github.com/jthornber/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="static test"
-RESTRICT="!test? ( test )"
-
-LIB_DEPEND="dev-libs/expat[static-libs(+)]
-	dev-libs/libaio[static-libs(+)]"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-DEPEND="${RDEPEND}
-	static? ( ${LIB_DEPEND} )
-	test? (
-		dev-lang/ruby:2.6
-		>=dev-cpp/gtest-1.8.0
-		dev-util/cucumber
-		dev-util/aruba
-	)
-	dev-libs/boost"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.7.0-build-fixes.patch )
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	use static && append-ldflags -static
-	STRIP=true econf \
-		--prefix="${EPREFIX}"/ \
-		--bindir="${EPREFIX}"/sbin \
-		--with-optimisation='' \
-		$(use_enable test testing)
-}
-
-src_compile() {
-	MAKEOPTS+=" V="
-	default
-}
-
-src_test() {
-	emake unit-test
-}
-
-src_install() {
-	emake DESTDIR="${D}" DATADIR="${ED%/}/usr/share" install
-	dodoc README.md TODO.org
-}
diff --git a/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.9.0-r1.ebuild b/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.9.0-r1.ebuild
index b00ab931548e..bce347e847db 100644
--- a/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.9.0-r1.ebuild
+++ b/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.9.0-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/jthornber/thin-provisioning-tools"
 
 if [[ ${PV} != *9999 ]]; then
 	SRC_URI="https://github.com/jthornber/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 else
 	inherit git-r3
 	EGIT_REPO_URI='https://github.com/jthornber/thin-provisioning-tools.git'