gentoo resync : 06.04.2022

21 files changed, 756 insertions, 26 deletions

diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz
index 38da986f76a9..a2f9c17bc5a3 100644
--- a/sys-block/Manifest.gz
+++ b/sys-block/Manifest.gz
diff --git a/sys-block/fio/Manifest b/sys-block/fio/Manifest
index 0b65159c114c..cb30104a48bb 100644
--- a/sys-block/fio/Manifest
+++ b/sys-block/fio/Manifest
@@ -1,6 +1,6 @@
 AUX fio-2.2.13-libmtd.patch 238 BLAKE2B da7843b4cb2b0fda12c2e950d4b51df661f229eb01b16b5a9d2a5d5e59b15f6c25d9865e607be8e1a86329964e2eb116ce0d1855dd1a80c156650db1ad5a3690 SHA512 66c905a79a78baaea0864d4fbf2432edfb2d98f2262ad638431d591154b1f8214dbc2ae6fed9cddd3cb4684932c830cc7402dc0a4c6b429dd955bb1a1f929f1a
 AUX fio-3.27-drop-raw.patch 3315 BLAKE2B 93cfc730e2feceae2cc20c76b93a4e1da2a6b0c8a3b3ba3231208d0074612a9a4e5836108aedb9dff03db61977c354a2fe1b2bf35c4e975b6e302a0357b78852 SHA512 67589a42e65be3821aac5043b910d589f735abb98d8b107ca9fc020d9c10b4c20f82b2e3dc9622d1f8b8ead5b69cc459470136c2d942a5690c7fdefebf57ecee
 DIST fio-3.27.tar.bz2 960330 BLAKE2B 7e7e01a5c1d6af13a6f87139e7738646cbc8f45ebc370d0c45b9efe1f93778613d374daafc6df459f988f27f2be54ff636235e1e5a92a4a6ecf9a60ed573d170 SHA512 9c5f2ab0c9ac24ab78dbc74fb6c5acd60f8189fdc618f4280992141b6c0abe1c235c373fee18ad0c803e7fb25d480f45aec56dc3be2e0d26d181b3418b179f99
-EBUILD fio-3.27-r2.ebuild 4207 BLAKE2B 6d0a7738642f004b87cbc5e47235953da92954ad83cd54d8c690bd942e66bf1eb26460ec10bf1ed68794bfbaf1bbbe6e754da52e129e77937285a69ae7543dae SHA512 967aa4f80431e1ee20f480214e2c2fd39e8f3a40fc4ce93095ef98d4c815c6c7ec486db6ff7ae64e0c8d267ad473a809a02dac42b3ef58c0d1d8c35281294e98
-EBUILD fio-3.27-r3.ebuild 4308 BLAKE2B 2a9cf3883b0305ab818515343d85921cb7d57a698e1a731c02641509d33a713250633567623680558e38f01ece56f851c3f22fa310658e99c2334af8dc9a1783 SHA512 d0a5ef4a607e128d37ed4c9928b31d0d722fb1b45afd69199b2b75e23678cc719720e7b9dd404db493343466d792784504085177c352ca2958ffb38ae34009f6
+EBUILD fio-3.27-r2.ebuild 4210 BLAKE2B 7b5896286280e68beafd273f6bace83356c81712e9665cb19be9ebcdc77b233a6dbf7efaa75d3a976a9bb48584022ad692f66756b5a1629dcd8188fca351a844 SHA512 b5cc6aaa16eb8f261c4ea34cc9ea7ae59669624d529d107e2fd7e9c5984997ab2ebd250d2930d53fa85e3ae765ba8cc96e22d2c246acfcf6344e8af0c57a6e87
+EBUILD fio-3.27-r3.ebuild 4311 BLAKE2B dfc72284cd9c88b680b7c5d946e21ce90450e72ad5f80597abdffffee6eeeeb9e0aa386e314aec56f8c2764280a8e039587f1eedac736145ec9e753a7bc8ce2f SHA512 93ce6fcbc75df4caadf20ec6208ffb6ed80a99b79f87a1d788c4c7a5d494bc546f9a79b87cec977369ef44113aeb1d8f8f817a0289d429c6fd2da1f6e429ed62
 MISC metadata.xml 1174 BLAKE2B ea2b1e11b071672b885227bec7f7335edf0614a3d08705a813c2c1de9e5b98eeaf9a01c26fe9e09d2a4d16f34bb00af0114c48c7b46b2a8c7624e811a89298e6 SHA512 f48fbd4cb4ebe8dbcd45e2961e5aaf0c680553c0d25bd5b376a3135df9ab4e495f36349820163362e3fe2c3a6631535896ce64b86904eb6c24be120ce2241865
diff --git a/sys-block/fio/fio-3.27-r2.ebuild b/sys-block/fio/fio-3.27-r2.ebuild
index afa61e798464..95b48167827b 100644
--- a/sys-block/fio/fio-3.27-r2.ebuild
+++ b/sys-block/fio/fio-3.27-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9,10} )
 
 inherit python-r1 toolchain-funcs
 
diff --git a/sys-block/fio/fio-3.27-r3.ebuild b/sys-block/fio/fio-3.27-r3.ebuild
index ee7e62db9305..55eb95c00e10 100644
--- a/sys-block/fio/fio-3.27-r3.ebuild
+++ b/sys-block/fio/fio-3.27-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9,10} )
 
 inherit python-r1 toolchain-funcs
 
diff --git a/sys-block/gparted/Manifest b/sys-block/gparted/Manifest
index 41357c86ddb6..2aa0b460d1ed 100644
--- a/sys-block/gparted/Manifest
+++ b/sys-block/gparted/Manifest
@@ -1,3 +1,5 @@
 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 2753 BLAKE2B bf11254020abab69d71ea3c6604949fd7c601d6873e5ddc6cad744e540c814b4d683015a57f9b5e41715b5495d69541c96bb053c57a1fa199d7ed40556eee0cd SHA512 77a4d66eb7bf40f20984a683f19d41a07414c58b435a6267eac3caa504a6ba4b1f4b0f5a4b1833ba2c1bd03e29d6bf6b3b1109f46cfc2a41719b8618a0ec7b29
 MISC metadata.xml 915 BLAKE2B 0d1b9e847455a3920c9826b8f352481448aa08b6a7625db5d19da403b5d20dcf4dcc78a9b7a3925fe06915a5078979668028c7c1e8da869a3f9d493fed22d2cb SHA512 7df8fd771da273681728e142d7e6ef10b5434dd40ac96eb2da96c1331116dbc33c7a25be5ca69dd8a56d3eb4ed961d4a51d4f0c554b44e5752169b0f5b9d2e8a
diff --git a/sys-block/gparted/gparted-1.4.0.ebuild b/sys-block/gparted/gparted-1.4.0.ebuild
new file mode 100644
index 000000000000..81494d836173
--- /dev/null
+++ b/sys-block/gparted/gparted-1.4.0.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome2 optfeature virtualx
+
+DESCRIPTION="Partition editor for graphically managing your disk partitions"
+HOMEPAGE="https://gparted.org/ https://gitlab.gnome.org/GNOME/gparted/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2+ FDL-1.2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="kde policykit wayland"
+
+DEPEND="
+	!policykit? (
+		kde? ( >=kde-plasma/kde-cli-tools-5.8.6-r1[kdesu] ) )
+	policykit? ( >=sys-auth/polkit-0.102 )
+	>=dev-cpp/glibmm-2.56.1:2
+	>=dev-cpp/gtkmm-3.24:3.0
+	>=dev-libs/glib-2.58.3-r1:2
+	>=sys-block/parted-3.2:=
+	>=dev-libs/libsigc++-2.10.1:2
+"
+RDEPEND="${DEPEND}
+	>=sys-apps/util-linux-2.33.2
+	wayland? ( x11-apps/xhost )
+"
+BDEPEND="
+	app-text/docbook-xml-dtd:4.1.2
+	>=dev-util/intltool-0.51.0-r2
+	dev-util/itstool
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_configure() {
+	gnome2_src_configure \
+		--enable-doc \
+		--enable-online-resize \
+		$(use_enable wayland xhost-root) \
+		GKSUPROG=kdesu \
+		ac_cv_prog_have_scrollkeeper_update=no
+}
+
+src_install() {
+	gnome2_src_install
+
+	local _ddir="${D}"/usr/share/applications
+	local _bdir="${D}"/usr/bin
+
+	if ! use policykit; then
+		if use kde; then
+			cp "${_ddir}"/gparted{,-kde}.desktop || die
+			cp "${_bdir}"/gparted{,-kde} || die
+			sed -i -e '/Exec/ s:gparted:gparted-kde:' "${_ddir}"/gparted-kde.desktop || die
+			echo 'OnlyShowIn=KDE;' >> "${_ddir}"/gparted-kde.desktop || die
+		fi
+	else
+		sed -i -e 's:kdesu::' "${_bdir}"/gparted || die
+	fi
+
+	mv "${ED}"/usr/share/{appdata,metainfo}
+}
+
+src_test() {
+	virtx emake check
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	optfeature_header
+	optfeature "BTRFS support"                   sys-fs/btrfs-progs
+	optfeature "DMRAID support"                  sys-fs/dmraid sys-fs/multipath-tools
+	optfeature "Encrypted device / LUKS support" sys-fs/cryptsetup
+	optfeature "exFAT support"                   sys-fs/exfatprogs
+	optfeature "EXT2/EXT3/EXT4 support"          sys-fs/e2fsprogs
+	optfeature "F2FS support"                    sys-fs/f2fs-tools
+	optfeature "FAT support"                     sys-fs/dosfstools sys-fs/mtools
+	optfeature "HFS support"                     sys-fs/diskdev_cmds sys-fs/hfsutils virtual/udev
+	optfeature "JFS support"                     sys-fs/jfsutils
+	optfeature "MDADM support"                   sys-fs/mdadm
+	optfeature "NTFS support"                    sys-fs/ntfs3g[ntfsprogs]
+	optfeature "Reiser4 support"                 sys-fs/reiser4progs
+	optfeature "ReiserFS support"                sys-fs/reiserfsprogs
+	optfeature "UDF support"                     sys-fs/udftools
+	optfeature "XFS support"                     sys-fs/xfsprogs sys-fs/xfsdump
+}
diff --git a/sys-block/megarc/Manifest b/sys-block/megarc/Manifest
index 00d3fd1fb8ac..f19648cc0781 100644
--- a/sys-block/megarc/Manifest
+++ b/sys-block/megarc/Manifest
@@ -1,4 +1,4 @@
 DIST README_FOR_ut_linux_megarc_1-11-zip.txt 3512 BLAKE2B acaf7d5213b1c13d46a8cca23f5f4ad87d8fa27bf64f61bd57916ff1e0addb0593f53b654a3383e2cb8342c2332b8e55cd5ead5830d157de52b36abef1be1167 SHA512 8ee63fad41875442e158b72a82fafe1ed15e00fd47bed2ff1f4f37f4bd6685eccfcd361294a2694a23c4d53d024d9488d5272ba5352685f346b7722ae7cff694
 DIST ut_linux_megarc_1-11.zip 301703 BLAKE2B e6092fe3e6a58b1d88701801121f2e77b324d3420aa55c824c600917387275f015677c470b7b9e1639777bfed40141e3cb7f5d88f6b08559d2243cb1b657f187 SHA512 9f79ad0c0bb05b9fd9044d66551da0ac95485ddd8ed3a37f1bdb064db80c97897f904150418e93b66783e86bc3ccb2ec1eca9bac7a5dd25bb03cd4414b8389b7
-EBUILD megarc-1.11-r3.ebuild 1843 BLAKE2B 9d4d40b0998b53bfda47b1ea3ce1f177407f74ea2c6212daab0d4aa926774c0dc36e0a38ad83071c2bd103e8a8bcececb7ca8da3b5e6a59b8d7144c95cb8dcde SHA512 bd9c77bfa9f92952571b99f00da92bbc28aad441e7b91c5391b559367ddc1adf95cd32e4de7ab814248350df35a3a13c620af71269e245c53e36de4e0f88645e
+EBUILD megarc-1.11-r3.ebuild 1734 BLAKE2B 05e25b66f9fad2ce6b32d0fa9eb1cfb814270f822b67b4e98100f66be7453aa2b294e682c2e60d9c3f3dc44776c6038ff38a54798e8cd0a7557a7b375a0791af SHA512 b64b6b61c9682bf46e64ef8e0393c3edee4c04d31222a4151ec05473f52ef83787cee912fc8831ea5456f231cfb034a042679e61bc6e74014b82e213bd2221f1
 MISC metadata.xml 319 BLAKE2B 5a45f58f8cc5f61094270415357ea4a684040c69f261e9bc3bc07ef5cf8252e5c1201aac2317c2a14571185e7964fcd706533b15022820d14cb653c8aef1cc14 SHA512 c8e3764dd6248eebe247218e5a53136627fb3117f620ee336d6555f7c6b5fd62fc2eeb287d63120e50efa14496db647363ae3f2047efcfcca7cfde6e7a8fe6aa
diff --git a/sys-block/megarc/megarc-1.11-r3.ebuild b/sys-block/megarc/megarc-1.11-r3.ebuild
index 096122d4a4f7..a352a738c3d0 100644
--- a/sys-block/megarc/megarc-1.11-r3.ebuild
+++ b/sys-block/megarc/megarc-1.11-r3.ebuild
@@ -1,9 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="8"
-
-inherit multilib
+EAPI=8
 
 MY_PN="ut_linux_megarc"
 MY_PV="${PV//./-}"
@@ -20,6 +18,7 @@ HOMEPAGE="http://www.avagotech.com/cs/Satellite?q=megacli&pagename=AVG2%2Fsearch
 SRC_URI="
 	https://docs.broadcom.com/docs-and-downloads/raid-controllers/raid-controllers-common-files/${MY_P}.zip
 	https://docs.broadcom.com/docs-and-downloads/raid-controllers/raid-controllers-common-files/README_FOR_${MY_P}-zip.txt"
+S="${WORKDIR}"
 
 LICENSE="LSI"
 SLOT="0"
@@ -27,23 +26,18 @@ SLOT="0"
 # can remove the distfiles from their mirror anytime.
 KEYWORDS="~amd64 ~x86"
 IUSE="doc"
-
-DEPEND="app-arch/unzip
-	doc? ( app-text/antiword )"
-RDEPEND=""
-
 RESTRICT="mirror bindist"
 
-S="${WORKDIR}"
+BDEPEND="
+	app-arch/unzip
+	doc? ( app-text/antiword )"
 
 QA_PREBUILT="/opt/bin/megarc"
 
-pkg_setup() {
-	use amd64 && { has_multilib_profile || die "needs multilib profile on amd64"; }
-}
-
 src_compile() {
-	use doc && antiword ut_linux.doc > ${PN}-manual.txt
+	if use doc; then
+		antiword ut_linux.doc > ${PN}-manual.txt || die
+	fi
 }
 
 src_install() {
diff --git a/sys-block/open-iscsi/Manifest b/sys-block/open-iscsi/Manifest
index 75c35c1d27ca..5e77d7820055 100644
--- a/sys-block/open-iscsi/Manifest
+++ b/sys-block/open-iscsi/Manifest
@@ -2,6 +2,9 @@ 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
 DIST open-iscsi-2.1.4.tar.gz 621247 BLAKE2B 043a999b2f397a6c740d61654079d7ab966caee6cf6cfb244ddd70eae4f5201045b371ce5fbe244216a2a210a5379c92e8c3fbe62d33707cf05e7a4a20a13a91 SHA512 ae0663a964d86e6a4c19203598b859173c93ecce550f9bc9855ff735dd51a3c45822f2bc1cc99e6891c56ef1d16c42223803f07a961558fe6e38ead2164faef3
-EBUILD open-iscsi-2.1.4-r2.ebuild 3994 BLAKE2B 3ac697018584d5292168787c2827fdd9fe4167711a330c13efa3951dc49c6c0b6d2dbb694f2eb9cd10c6197863364a6a67c536e00b8a537fb79f95f6ee118385 SHA512 6bcb5d1ebccc34fb48e50b8f8996a34949d2675234b83321ceaef5213e4178b764e2b4589a536aa64b33c438960db9810a8abf84d84a17862b33592072166ecf
-MISC metadata.xml 459 BLAKE2B e9f49255c8b945db20b33b3fb030141e6c9fd0960593a066e9257b19c138db845d0d0868ed4438f0a5152756d918f30a2b7fb6694d7add7541b6558b3f5d0172 SHA512 1941299b204f8e69a9684c615c866fba2e8f6f4eaf8f9ddc2fec23ca05f8ba4df02e36a087a2cd67ea32ab62cf0d8ed8b85dbd20dbef641ba9cdea29486e558d
+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 4071 BLAKE2B 828a0cc92dd868778e6dbf97375cc4529b51e1b7dbad306ea9cf7bc8be08d8e2d6e415389f917bf9884959131b2a7f7391acf7a374a7f053ab5a64c21e178987 SHA512 cd8ac5ca54cfaf2354769f0d6ce7bc2e4718467e40388a10454b4754a99e33d77e1fb44c558b3992ebdfb8c23e50fa62898519ec36d669d41e5d44972a284b52
+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
new file mode 100644
index 000000000000..a25acc0c85db
--- /dev/null
+++ b/sys-block/open-iscsi/files/open-iscsi-2.1.6-Makefiles.patch
@@ -0,0 +1,81 @@
+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/metadata.xml b/sys-block/open-iscsi/metadata.xml
index 31d1940bfd0b..bd71215179c8 100644
--- a/sys-block/open-iscsi/metadata.xml
+++ b/sys-block/open-iscsi/metadata.xml
@@ -11,5 +11,6 @@
 	</use>
 	<upstream>
 		<remote-id type="github">open-iscsi/open-iscsi</remote-id>
+		<remote-id type="cpe">cpe:/a:open-iscsi_project:open-iscsi</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/sys-block/open-iscsi/open-iscsi-2.1.4-r2.ebuild b/sys-block/open-iscsi/open-iscsi-2.1.4-r2.ebuild
index 3b00ebc379c0..a2d3cf4be973 100644
--- a/sys-block/open-iscsi/open-iscsi-2.1.4-r2.ebuild
+++ b/sys-block/open-iscsi/open-iscsi-2.1.4-r2.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit autotools linux-info flag-o-matic toolchain-funcs udev systemd
 
 DESCRIPTION="A performant, transport independent, multi-platform implementation of RFC3720"
-HOMEPAGE="http://www.open-iscsi.com/"
+HOMEPAGE="https://www.open-iscsi.com/"
 SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/sys-block/open-iscsi/open-iscsi-2.1.6.ebuild b/sys-block/open-iscsi/open-iscsi-2.1.6.ebuild
new file mode 100644
index 000000000000..bcda02c039ab
--- /dev/null
+++ b/sys-block/open-iscsi/open-iscsi-2.1.6.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools linux-info flag-o-matic toolchain-funcs systemd
+
+DESCRIPTION="A performant, transport independent, multi-platform implementation of RFC3720"
+HOMEPAGE="https://www.open-iscsi.com/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/0.2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug infiniband +tcp rdma systemd"
+REQUIRED_USE="infiniband? ( rdma ) || ( rdma tcp )"
+
+DEPEND="
+	sys-apps/kmod
+	sys-block/open-isns:=
+	sys-kernel/linux-headers
+	infiniband? ( sys-cluster/rdma-core )
+	dev-libs/openssl:0=
+	systemd? ( sys-apps/systemd )
+"
+RDEPEND="${DEPEND}
+	sys-fs/lsscsi
+	sys-apps/util-linux"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.1.1-Makefiles.patch
+	"${FILESDIR}"/open-iscsi-2.1.6-Makefiles.patch
+)
+
+pkg_setup() {
+	linux-info_pkg_setup
+
+	if kernel_is -lt 2 6 16; then
+		die "Sorry, your kernel must be 2.6.16-rc5 or newer!"
+	fi
+
+	# Needs to be done, as iscsid currently only starts, when having the iSCSI
+	# support loaded as module. Kernel builtin options don't work. See this for
+	# more information:
+	# https://groups.google.com/group/open-iscsi/browse_thread/thread/cc10498655b40507/fd6a4ba0c8e91966
+	# If there's a new release, check whether this is still valid!
+	TCP_MODULES="SCSI_ISCSI_ATTRS ISCSI_TCP"
+	RDMA_MODULES="INFINIBAND_ISER"
+	INFINIBAND_MODULES="INFINIBAND_IPOIB INIBAND_USER_MAD INFINIBAND_USER_ACCESS"
+	CONFIG_CHECK_MODULES="tcp? ( ${TCP_MODULES} ) rdma? ( ${RDMA_MODULES} ) infiniband? ( ${INFINIBAND_MODULES} )"
+	if linux_config_exists; then
+		if use tcp; then
+			for module in ${TCP_MODULES}; do
+				linux_chkconfig_module ${module} || ewarn "${module} needs to be built as module (builtin doesn't work)"
+		done
+		fi
+		if use infiniband; then
+			for module in ${INFINIBAND_MODULES}; do
+				linux_chkconfig_module ${module} || ewarn "${module} needs to be built as module (builtin doesn't work)"
+		done
+		fi
+		if use rdma; then
+			for module in ${RDMA_MODULES}; do
+				linux_chkconfig_module ${module} || ewarn "${module} needs to be built as module (builtin doesn't work)"$
+			done
+		fi
+	fi
+}
+
+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
+	eautoreconf
+	popd >/dev/null || die
+}
+
+src_configure() {
+	use debug && append-cppflags -DDEBUG_TCP -DDEBUG_SCSI
+
+	append-lfs-flags
+}
+
+src_compile() {
+	# Stuffing CPPFLAGS into CFLAGS isn't entirely correct, but the build
+	# is messed up already here, so it's not making it that much worse.
+	KSRC="${KV_DIR}" CFLAGS="" \
+	emake \
+		OPTFLAGS="${CFLAGS} ${CPPFLAGS} $(usex systemd '' -DNO_SYSTEMD)" \
+		AR="$(tc-getAR)" CC="$(tc-getCC)" \
+		$(usex systemd '' NO_SYSTEMD=1) \
+		user
+}
+
+src_install() {
+	emake DESTDIR="${ED}" sbindir="/usr/sbin" SED="${EPREFIX}/bin/sed" install
+
+	# Upstream make is not deterministic, per bug #601514
+	rm -f "${ED}"/etc/initiatorname.iscsi
+
+	dodoc README THANKS
+
+	docinto test/
+	dodoc $(find test -maxdepth 1 -type f ! -name ".*")
+
+	insinto /etc/iscsi
+	newins "${FILESDIR}"/initiatorname.iscsi initiatorname.iscsi.example
+
+	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
+}
+
+pkg_postinst() {
+	in='/etc/iscsi/initiatorname.iscsi'
+	if [[ ! -f "${EROOT}${in}" ]] && [[ -f "${EROOT}${in}.example" ]] ; then
+		{
+		  cat "${EROOT}${in}.example"
+		  echo "# InitiatorName generated by ${CATEGORY}/${PF} at $(date -uR)"
+		  echo "InitiatorName=$(${ROOT}/usr/sbin/iscsi-iname)"
+		} >> "${EROOT}${in}.tmp" && mv -f "${EROOT}${in}.tmp" "${EROOT}${in}"
+	fi
+}
diff --git a/sys-block/partimage/Manifest b/sys-block/partimage/Manifest
index ebab9255e943..fc6ea6ff6522 100644
--- a/sys-block/partimage/Manifest
+++ b/sys-block/partimage/Manifest
@@ -1,6 +1,8 @@
+AUX partimage-0.6.9-clang.patch 8058 BLAKE2B 2784fade3808eef2f8eacaa4441a6df3624c829954e33b186da2b9f8107aa3901b90f2bfb52e9a207e1beb1a3daa16bab18fbfc4db1b3800d97daa6003ea76ce SHA512 b0f17c618ed9e0c0e51c8534a2f0548dd466667eb3bf22a19869790ce8b7596a0f4b5d2aeb75d0a6351aeb83a9ac9f9aa8401d36413a84276714e0f95b6061bc
 AUX partimage-0.6.9-minor-typo.patch 313 BLAKE2B c0d04a86e0d4c27ce8a1b097525c029c258ef37968058a888f2fbfc55da2035134b058c8b1118a0f86a3c3b5cd63116d5435371b43f9ba4b0f3e70ec830d18e8 SHA512 7bf9de9b08afce5c3b2bfa8943561df0605066866f7ba748872c9f81e1be4033e6f88c8033af1e1b7e2adb64263e8177ba9bcad1ac2e613b27e9c219fbff6828
 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
@@ -8,4 +10,5 @@ AUX partimaged.pam.2 249 BLAKE2B e40a15c5fe4dc394cbcf9c478c3c764e67ec317f31c0397
 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 3441 BLAKE2B 5c43bae80a6306ed47ffc9b2373815fc3dec3388bc39260a960efb9ea69c0798f7beae55ea8b559eac716de2e0b6acef764ece8e6ae2d426332e8cbd248fc014 SHA512 4921c1fee5b2503d43c3a4cb43b95c7810fd01133e2d0cba97af1dcb05d8574d4abc09bba288e6390c102148f0bd5cb8ca6f8032d3cc7d20aaaf9e3b9cec82e8
 MISC metadata.xml 428 BLAKE2B 61e6517a2ee09ecc1093f4a90bae9cd7a1228cad3672bfaefba6a3d0785f34d3dfe35689c0798f0db3319441d31777b8f2bc2ca93ccef89780d280c6f0b26130 SHA512 2d0d8f33b9952b027e292899d5c046bed94a56b126d9a3a446ee9e5dc4f48e2a4cd5970cef576b8e72c2926b10ec15e6af2031347a7209a84470fafe3d92a89e
diff --git a/sys-block/partimage/files/partimage-0.6.9-clang.patch b/sys-block/partimage/files/partimage-0.6.9-clang.patch
new file mode 100644
index 000000000000..b6df8868d16e
--- /dev/null
+++ b/sys-block/partimage/files/partimage-0.6.9-clang.patch
@@ -0,0 +1,181 @@
+--- a/src/client/gui_text.cpp
++++ b/src/client/gui_text.cpp
+@@ -341,7 +341,7 @@
+   m_labelSplit = newtLabel(1, 12, i18n("Image split mode"));
+   m_radioSplitAuto = newtRadiobutton(1, 13, i18n("Automatic split (when no space left)"), !options.qwSplitSize, NULL);
+   m_radioSplitSize = newtRadiobutton(1, 14, i18n("Into files whose size is:............"), !!options.qwSplitSize, m_radioSplitAuto);
+-  SNPRINTF(szTemp, "%"PRIu64"", (!!options.qwSplitSize) ? (options.qwSplitSize/1024/1024) : 2048);
++  SNPRINTF(szTemp, "%" PRIu64 "", (!!options.qwSplitSize) ? (options.qwSplitSize/1024/1024) : 2048);
+   m_editSplitSize = newtEntry(43, 14, szTemp, 8, NULL, 0);
+   m_labelSplitSizeKB = newtLabel(52, 14, i18n("MiB"));
+   m_checkSplitWait = newtCheckbox(1, 15, i18n("Wait after each volume change"), (!!options.bSplitWait ? 'X' : ' '), " X", NULL);
+@@ -462,7 +462,7 @@
+   SNPRINTF(szTemp, i18n("Partition to save:...........%s"), szDevice);
+   m_labelPartition = newtLabel(1, 0, szTemp);
+   
+-  SNPRINTF(szTemp, i18n("Size of the Partition:.......%s = %"PRIu64" bytes"), formatSize(qwPartSize, szTemp2), qwPartSize);
++  SNPRINTF(szTemp, i18n("Size of the Partition:.......%s = %" PRIu64 " bytes"), formatSize(qwPartSize, szTemp2), qwPartSize);
+   m_labelPartitionSize = newtLabel(1, 1, szTemp);
+   
+   SNPRINTF(szTemp, i18n("Image file to create:........%s"), szImageFile);
+@@ -610,7 +610,7 @@
+       newtLabelSetText(m_labelImageFileSize, szTemp);
+     }
+   
+-  SNPRINTF (szTemp, i18n("Available space for image:...%s = %"PRIu64" bytes"), formatSize(qwFreeSpace, szTemp2), qwFreeSpace);
++  SNPRINTF (szTemp, i18n("Available space for image:...%s = %" PRIu64 " bytes"), formatSize(qwFreeSpace, szTemp2), qwFreeSpace);
+   newtLabelSetText(m_labelFreeSpace, szTemp);
+ 
+   //option -B gui=no
+@@ -734,7 +734,7 @@
+   SNPRINTF(szTemp, i18n("Partition to restore:.............%s"), szDevice);
+   m_labelPartition = newtLabel(1, 0, szTemp);
+   
+-  SNPRINTF(szTemp, i18n("Size of partition to restore:.....%s = %"PRIu64" bytes"), formatSize(qwCurPartSize, szTemp2), qwCurPartSize);
++  SNPRINTF(szTemp, i18n("Size of partition to restore:.....%s = %" PRIu64 " bytes"), formatSize(qwCurPartSize, szTemp2), qwCurPartSize);
+   m_labelPartitionSize = newtLabel(1, 1, szTemp);
+   
+   SNPRINTF(szTemp, i18n("Image file to use:................%s"), szImageFile);
+@@ -751,7 +751,7 @@
+   SNPRINTF(szTemp, i18n("Image created on:.................%s\n"), asctime_portable(&dateCreate));
+   m_labelDate = newtLabel(1, 6, szTemp);
+ 
+-  SNPRINTF(szTemp, i18n("Size of the original partition:...%s = %"PRIu64" bytes"), formatSize(qwOrigPartSize, szTemp2), qwOrigPartSize);
++  SNPRINTF(szTemp, i18n("Size of the original partition:...%s = %" PRIu64 " bytes"), formatSize(qwOrigPartSize, szTemp2), qwOrigPartSize);
+   m_labelOriginalPartitionSize = newtLabel(1, 7, szTemp);
+ 
+   // stats
+--- a/src/client/imginfo.cpp
++++ b/src/client/imginfo.cpp
+@@ -111,7 +111,7 @@
+ {
+   snprintf(szText, nMaxTextLen, i18n("-------------------- MBR %.3d -------------------\n"
+ 				     "Device:................%s\n"
+-				     "Device blocks count:...%"PRIu64"\n"
++				     "Device blocks count:...%" PRIu64 "\n"
+ 				     "Device model:..........%s\n\n"),
+ 	   i, mbr->szDevice, mbr->qwBlocksCount, mbr->szDescModel);
+ }
+@@ -153,7 +153,7 @@
+   snprintf(szText, nMaxTextLen, i18n("Volume number:.........%u\n"
+ 				     "Volume size:...........%s\n"
+ 				     "Compression level: ....%d -> %s\n"
+-				     "Identificator:.........%"PRIu64"=%"PRIX64"\n\n"),
++				     "Identificator:.........%" PRIu64 "=%" PRIX64 "\n\n"),
+ 	   head->dwVolumeNumber, formatSize(qwImageSize, cTemp), dwCompression, 
+ 	   szCompression, head->qwIdentificator, head->qwIdentificator);
+ }
+--- a/src/client/main.cpp
++++ b/src/client/main.cpp
+@@ -301,7 +301,7 @@
+ 	  case 'V': // split image into multiple files
+ 	  
+ 	    options.qwSplitSize = (QWORD)atol(optarg) * 1024 * 1024;
+-	    fprintf (stderr, i18n("Volume size: %"PRIu64" bytes (%ld MiB)\n"),
++	    fprintf (stderr, i18n("Volume size: %" PRIu64 " bytes (%ld MiB)\n"),
+ 		     options.qwSplitSize, atol(optarg));
+ 	    break;
+ 	  
+--- a/src/client/misc.cpp
++++ b/src/client/misc.cpp
+@@ -211,7 +211,7 @@
+ 	  image.closeReading(true);
+           throw excep;
+ 	}
+-      SNPRINTF(szTemp, "%.3u: %s [%"PRIu64" blocks]", i, mbrOriginal[i].szDevice, mbrOriginal[i].qwBlocksCount);
++      SNPRINTF(szTemp, "%.3u: %s [%" PRIu64 " blocks]", i, mbrOriginal[i].szDevice, mbrOriginal[i].qwBlocksCount);
+       if (options->bBatchMode == false)
+ 	optGui.addMbr(szTemp, i);
+       
+--- a/src/client/fs/fs_base.cpp
++++ b/src/client/fs/fs_base.cpp
+@@ -730,10 +730,10 @@
+ 
+   if (bShowBlocksInfo)
+     {
+-      SNPRINTF(szBlocksInfo, i18n("Block size:...................%"PRIu64" bytes\n"
+-				  "Total blocks count:...........%"PRIu64"\n"
+-				  "Used blocks count:............%"PRIu64"\n"
+-				  "Free blocks count:............%"PRIu64"\n"),
++      SNPRINTF(szBlocksInfo, i18n("Block size:...................%" PRIu64 " bytes\n"
++				  "Total blocks count:...........%" PRIu64 "\n"
++				  "Used blocks count:............%" PRIu64 "\n"
++				  "Free blocks count:............%" PRIu64 "\n"),
+ 	       m_header.qwBlockSize, 
+ 	       m_header.qwBlocksCount,
+ 	       m_header.qwUsedBlocks,
+@@ -745,7 +745,7 @@
+     }
+  
+   snprintf(szDest, nMaxLen, i18n("%s" // Blocks infos
+-				 "Space usage:..................%"PRIu64" %%\n"
++				 "Space usage:..................%" PRIu64 " %%\n"
+ 				 "Used space:...................%s\n"
+ 				 "Free space:...................%s\n"
+ 				 "Bitmap size:..................%s\n"
+--- a/src/client/fs/fs_hfs.cpp
++++ b/src/client/fs/fs_hfs.cpp
+@@ -142,10 +142,10 @@
+   getStdInfos(szText, sizeof(szText), true);
+   
+   SNPRINTF(szFullText, i18n("%s" // standard infos
+-			    "Allocation Group count:.......%"PRIu64"\n"
++			    "Allocation Group count:.......%" PRIu64 "\n"
+ 			    "Blocks per Allocation Group:..%u\n"
+ 			    "Allocation Group size:........%s\n"
+-			    "First allocation block:.......%"PRIu64"\n"),
++			    "First allocation block:.......%" PRIu64 "\n"),
+ 	   szText, m_info.qwAllocCount, m_info.dwBlocksPerAlloc,
+ 	   formatSize(m_info.dwAllocSize,szTemp1), m_info.qwFirstAllocBlock);
+     
+--- a/src/client/fs/fs_ntfs.cpp
++++ b/src/client/fs/fs_ntfs.cpp
+@@ -312,7 +312,7 @@
+ 			    "Bytes per sector:.............%u\n"
+ 			    "Sectors per cluster:..........%u\n"
+ 			    "File record size:.............%u\n"
+-			    "LCN of MFT Data attrib:.......%"PRIu64"\n"),
++			    "LCN of MFT Data attrib:.......%" PRIu64 "\n"),
+ 	   szText, m_info.nBytesPerSector, m_info.cSectorsPerCluster, 
+ 	   m_info.dwFileRecordSize, m_info.qwLCNOfMftDataAttrib);
+     
+@@ -730,7 +730,7 @@
+   QWORD i;
+   
+   for (i=0L; i < m_qwClustersCount; i++)
+-    fprintf(stderr, "cluster[%llu] = %"PRIu64"\n", (long long unsigned int)i, m_qwOffset[i]);
++    fprintf(stderr, "cluster[%llu] = %" PRIu64 "\n", (long long unsigned int)i, m_qwOffset[i]);
+   
+ }
+ 
+--- a/src/client/fs/fs_ufs.cpp
++++ b/src/client/fs/fs_ufs.cpp
+@@ -217,7 +217,7 @@
+ 			    "Cylinder group size:..........%s\n"
+ 			    "Basic blocks per CG:..........%u\n"
+ 			    "Basic block size:.............%u\n"
+-			    "Data frags count:.............%"PRIu64"\n"),
++			    "Data frags count:.............%" PRIu64 "\n"),
+ 	   szText, m_info.dwCylinderGroupsCount, 
+ 	   formatSize(m_info.dwCylinderGroupSize*m_info.dwBasicBlockSize,szTemp1),
+ 	   m_info.dwCylinderGroupSize, m_info.dwBasicBlockSize, m_info.qwDataFrags);
+--- a/src/shared/common.cpp
++++ b/src/shared/common.cpp
+@@ -272,7 +272,7 @@
+   
+   if (qwSize < llKiloB) // In Bytes
+     {
+-      snprintf(szText, nMaxLen, i18n("%"PRId64" bytes"), qwSize);
++      snprintf(szText, nMaxLen, i18n("%" PRId64 " bytes"), qwSize);
+     }
+   else if (qwSize < llMegaB) // In KiloBytes
+     {
+@@ -311,7 +311,7 @@
+ 
+   if (qwSize < llKiloB) // In Bytes
+     {
+-      snprintf(szText, nMaxLen, i18n("%"PRId64" Bytes"), qwSize);
++      snprintf(szText, nMaxLen, i18n("%" PRId64 " Bytes"), qwSize);
+     }
+   else if (qwSize < llMegaB) // In KiloBytes
+     {
diff --git a/sys-block/partimage/files/partimage-0.6.9-zlib-1.2.5.2-r1.patch b/sys-block/partimage/files/partimage-0.6.9-zlib-1.2.5.2-r1.patch
new file mode 100644
index 000000000000..05150e131e36
--- /dev/null
+++ b/sys-block/partimage/files/partimage-0.6.9-zlib-1.2.5.2-r1.patch
@@ -0,0 +1,33 @@
+http://bugs.gentoo.org/405323
+
+--- a/src/client/imagefile.cpp
++++ b/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
+--- a/src/client/imagefile.h
++++ b/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-r3.ebuild b/sys-block/partimage/partimage-0.6.9-r3.ebuild
new file mode 100644
index 000000000000..acd0d0f68be4
--- /dev/null
+++ b/sys-block/partimage/partimage-0.6.9-r3.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic pam
+
+DESCRIPTION="Console-based application to efficiently save raw partition data to image file"
+HOMEPAGE="https://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"
+REQUIRED_USE="static? ( !pam )"
+
+COMMON_DEPEND="
+	acct-group/partimag
+	acct-user/partimag
+"
+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="pam? ( sys-libs/pam )"
+RDEPEND="
+	${COMMON_DEPEND}
+	${PAM_DEPEND}
+	!static? ( ${LIBS_DEPEND} )
+"
+DEPEND="
+	${PAM_DEPEND}
+	${LIBS_DEPEND}
+"
+BDEPEND="
+	${COMMON_DEPEND}
+	nls? ( sys-devel/gettext )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.6.9-zlib-1.2.5.2-r1.patch #405323
+	"${FILESDIR}"/${PN}-0.6.9-minor-typo.patch #580290
+	"${FILESDIR}"/${PN}-0.6.9-openssl-1.1-compatibility.patch
+	"${FILESDIR}"/${PN}-0.6.9-missing-includes.patch
+	"${FILESDIR}"/${PN}-0.6.9-clang.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# XXX: Do we still need these?
+	filter-flags -fno-exceptions
+	use ppc && append-flags -fsigned-char
+
+	local myeconfargs=(
+		$(use_enable nls)
+		$(usex nologin '--disable-login' '')
+		$(use_enable pam)
+		$(use_enable ssl)
+		$(use_enable static all-static)
+		--with-log-dir="${EPREFIX}"/var/log/partimage
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	keepdir /var/lib/partimage
+	keepdir /var/log/partimage
+
+	newinitd "${FILESDIR}"/partimaged.init.2 partimaged
+	newconfd "${FILESDIR}"/partimaged.conf partimaged
+
+	if use pam; then
+		newpamd "${FILESDIR}"/partimaged.pam.2 partimaged
+	fi
+
+	if use ssl; then
+		insinto /etc/partimaged
+		doins "${FILESDIR}"/servercert.cnf
+	fi
+
+	fowners partimag:root /etc/partimaged/partimagedusers
+}
+
+pkg_config() {
+	if use ssl; then
+		local confdir="${EROOT}"/etc/partimaged
+		local privkey="${confdir}"/partimaged.key
+		local cnf="${confdir}"/servercert.cnf
+		local csr="${confdir}"/partimaged.csr
+		local cert="${confdir}"/partimaged.cert
+
+		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}" 2048 || 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"
+		chmod 600 "${privkey}" || die
+		chown partimag:root "${privkey}" || die
+		chmod 644 "${cert}" "${csr}" || die
+		chown root:root "${cert}" "${csr}" || die
+		einfo "Done"
+	else
+		einfo "SSL is disabled, not building certificates"
+	fi
+}
+
+pkg_postinst() {
+	if use ssl; then
+		einfo "To create the required SSL certificates, please do:"
+		einfo "emerge --config =${PF}"
+	fi
+}
diff --git a/sys-block/tgt/Manifest b/sys-block/tgt/Manifest
index 2d91f454d9d4..e7994e15f249 100644
--- a/sys-block/tgt/Manifest
+++ b/sys-block/tgt/Manifest
@@ -3,6 +3,8 @@ AUX tgtd.confd 108 BLAKE2B 74e5f66f6fb193541853e562cd1de5e99806f1f324db6efb5f9a5
 AUX tgtd.initd 3435 BLAKE2B d2441a515c7a270472efd0c4ef5e928827bde54b248d09bb47f4fcc53c46e4678acf049c16ee761f29eb8e928f0713f38a9f73bd13db1e0408da56f42f64b337 SHA512 1e6d114dbb89c7a26e65546b6c775bcabc3c9508e0757e118a4272fbf4299a185b4679bc510d9cc3da7db25b96343ddc8e45de044543ebe26d952132eba4de30
 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
 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
 MISC metadata.xml 749 BLAKE2B 0bc71ded3e2d650bd34edcb3e5515926248ff71354db504d94c548ec951ded4f71e5af1d5127d8fa3a0a3b398204436743d016fbd1cc1e765b6303a8bd734fd8 SHA512 94f7b923adade87a471854f469731094b00872727c7a668ea7e34e558eb87e661ab01c42fbe920a885f28c394f2bc9bf0fba0e48b84893ecade9c3d967e4c2ea
diff --git a/sys-block/tgt/tgt-1.0.82.ebuild b/sys-block/tgt/tgt-1.0.82.ebuild
new file mode 100644
index 000000000000..43d1f60ba296
--- /dev/null
+++ b/sys-block/tgt/tgt-1.0.82.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 fe89ffe9e628..9ba7ea666ac9 100644
--- a/sys-block/whdd/Manifest
+++ b/sys-block/whdd/Manifest
@@ -1,4 +1,4 @@
 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-9999.ebuild 640 BLAKE2B 06acec3ac035a1f173f7f433c8acfa4f80019909c18a58ef9e1e6779bd579926e89bc9e267bc4e155bc8ce3687fb06f1072bf65c6e42309cf05d97e0996077f7 SHA512 faa73e5e38d059f8d586e6f1bffcfee5b39e06fc26cea241ffc9dde2813491eae8341efa1c6d393fc6eb61c8f57eef88de321483a41a2becf3ef5e6b5f66ba33
-MISC metadata.xml 326 BLAKE2B 3bcb4400fcc78f93ddf821165ea3925ac813cac351e93d03c615343a868094666bba504c78413378bd07ee132e57ea14b04cb701134fabaf1cfceab232bf88f4 SHA512 96a33500aaa57cd9976d0cef5111dbace6dca895382d18184df14600d8422d06480d00e665eec0ef8a84577c09d439eda26e85be3bbdaf186d6b5cf1c56eeb93
+MISC metadata.xml 320 BLAKE2B 45eeb9de5a78b1f044939348f2fb7e0befb2a3fe2aa66da3dbe30c122c64c105142ba44bfec78e2d760b5a8a185698dc5389bb8f3d9f644dd5c0ee686bd882ec SHA512 ecefce54584273fc6fc699534fc671aa361542c72f0525e779da25180b843b9ee6eb42f467097c3d06b7da200575ac9bdc2c8e1af26e02a6b89f6e7c40a65a16
diff --git a/sys-block/whdd/metadata.xml b/sys-block/whdd/metadata.xml
index 323f3173c786..fdad2c16cfd6 100644
--- a/sys-block/whdd/metadata.xml
+++ b/sys-block/whdd/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>andrey_utkin@gentoo.org</email>
-		<name>Andrey Utkin</name>
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="github">whdd/whdd</remote-id>