gentoo resync : 31.05.2021

22 files changed, 8 insertions, 906 deletions

diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz
index 3743fadca7a7..da6313123c9a 100644
--- a/sys-block/Manifest.gz
+++ b/sys-block/Manifest.gz
diff --git a/sys-block/gparted/Manifest b/sys-block/gparted/Manifest
index 444157778bcb..d35609e1df32 100644
--- a/sys-block/gparted/Manifest
+++ b/sys-block/gparted/Manifest
@@ -1,7 +1,3 @@
-DIST gparted-1.1.0.tar.gz 4032829 BLAKE2B d47d45e77a3d9dc29e9fa0428aaa7c12bb863cb70ac11f4055cbcc0a0fde8019fbb20266b7f810d6a47c5239248486049c8e9813ead8e88081dd16f445da036a SHA512 afaad690fccbec7385b078a299b78bf4f0f83999e2661f89cb97f9e8f2b30ee41f0535450075e3a7174967e77c75024df78863d0d90d5e8dc726a487b4ae0bae
-DIST gparted-1.2.0.tar.gz 4057490 BLAKE2B 55b03f6bfe99ccccc7394dd64783c89511e48f8c9dd3d64792bb517a27ff5e77fc3be6bbd3ba140efd2ee525cffa4ba8d3136fd947e2d6e45a30f8bcaefb7a89 SHA512 10375ae351805597ec22aa7a7cc13e03bd08c45047c1a48c68194d6129b27f16035d2633d48db0d71923f6b45946ad6a218c17bfac7c38747ed7f908182c5445
 DIST gparted-1.3.0.tar.gz 4167440 BLAKE2B 87af5285a54af2ceb75eb6580b6492f7bcf6d8d2a9b4d614761b60c2b1776b2a8e14064ed5a77091074c5c5ff87169f3525fec2f37a280d35289677aaf75eba5 SHA512 8349ebdf2312e32df9f40d24aa42a4604897ebae72e58fd1046ab0897b3380a762b49f74bdcf3bd570b4e7a3468b6f225c22290c6b1b799911da17408912288b
-EBUILD gparted-1.1.0.ebuild 2172 BLAKE2B 9b3ca7d93c60746378c1d3c83b2fb74af17a70c43a0e1fd3f8c00a12b58ddc3be80560c785fbda89b99d2a0d0f582dba3a4e6e0f9779c5d6032555cf217e3cf1 SHA512 7fcc0b78d4de2d58a08794dcab6b5b025646ca52e186db9984493131a7f6b158cdb5f3dbfe066d8f7d02b5f1c8d91fc888af8be0ea79b53125b00e252a1c6b65
-EBUILD gparted-1.2.0.ebuild 2673 BLAKE2B f5052c34eb937555932c82febc900f002ab9a9a28806c04d0384df3cebc5cb33598ce0a7ff39ba0ec750ceeb69e8f473203f75e3978de2e4de750f2e93585cf0 SHA512 a8173ed2b47ac231e0320e0e582bc25c5a79cca6c09073b3c497bf68f5694796a1d08e9b72d86c2afabdaaa5276d64aa4bcab44db2edb7ac7fe73045c9ad6622
-EBUILD gparted-1.3.0.ebuild 2673 BLAKE2B f5052c34eb937555932c82febc900f002ab9a9a28806c04d0384df3cebc5cb33598ce0a7ff39ba0ec750ceeb69e8f473203f75e3978de2e4de750f2e93585cf0 SHA512 a8173ed2b47ac231e0320e0e582bc25c5a79cca6c09073b3c497bf68f5694796a1d08e9b72d86c2afabdaaa5276d64aa4bcab44db2edb7ac7fe73045c9ad6622
-MISC metadata.xml 2003 BLAKE2B c1568f7b030ae6d3f0ddc3724424bac3701fd470a535c5cedb8c5fb01f2c7f4f20476075be0033dacaf59bc9797f155c7fecc7ea4ef19ac4545454c275b82010 SHA512 03814c5741c01c342ebaa7b4923253f8efeb7beeb5026866dbc8a28ce1b3c3562c06eff108a15f2365070d389a84fe6d498bde39ed0632a63cf1eef412b3b97b
+EBUILD gparted-1.3.0.ebuild 2669 BLAKE2B d18dda2669d388b281c4a6f97af1bdf6d363e24963762e9b7bddb2aa90203238d6322a16c2ecbfcd7930e03d128ca39e4d621a5adba404810c1c2c9de46cd5dc SHA512 3780a7fd984016f9285668ce474b367c901e9f9d6308a3ad66a0061cf39a9281eb56d6fd518f26623ebc1f71f9de51f4ef31f91f5b49d2dcbef28216177178ff
+MISC metadata.xml 914 BLAKE2B 2b13b160df0e1de5c1466716012819cef64a008b714ecc40856b12b6a81e8d8e4291f1903300eaad015726fcf5c7cca155dfd56e0464a95ed4912a7b715ae6c2 SHA512 87f7a5223c17cf3bfeff25ef25f4f0970140cad4c37b24154ac24afae9430bcd33ef8adc48777dfeb38cd8b24c94f936ee992fc8f63e6a6220db5fdf073614b4
diff --git a/sys-block/gparted/gparted-1.1.0.ebuild b/sys-block/gparted/gparted-1.1.0.ebuild
deleted file mode 100644
index b718488bdc55..000000000000
--- a/sys-block/gparted/gparted-1.1.0.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2 virtualx
-
-DESCRIPTION="Gnome Partition Editor"
-HOMEPAGE="https://gparted.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+ FDL-1.2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
-IUSE="btrfs cryptsetup dmraid f2fs fat hfs jfs kde mdadm ntfs policykit reiserfs reiser4 udf wayland xfs"
-
-COMMON_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="${COMMON_DEPEND}
-	>=sys-apps/util-linux-2.33.2
-	>=sys-fs/e2fsprogs-1.44.5
-	btrfs? ( sys-fs/btrfs-progs )
-	cryptsetup? ( sys-fs/cryptsetup )
-	dmraid? (
-		>=sys-fs/lvm2-2.02.116
-		sys-fs/dmraid
-		sys-fs/multipath-tools )
-	f2fs? ( sys-fs/f2fs-tools )
-	fat? (
-		sys-fs/dosfstools
-		sys-fs/mtools )
-	hfs? (
-		sys-fs/diskdev_cmds
-		virtual/udev
-		sys-fs/hfsutils )
-	jfs? ( sys-fs/jfsutils )
-	mdadm? ( sys-fs/mdadm )
-	ntfs? ( >=sys-fs/ntfs3g-2016.2.22-r2[ntfsprogs] )
-	reiserfs? ( sys-fs/reiserfsprogs )
-	reiser4? ( sys-fs/reiser4progs )
-	udf? ( sys-fs/udftools )
-	wayland? ( x11-apps/xhost )
-	xfs? ( sys-fs/xfsprogs sys-fs/xfsdump )
-"
-DEPEND="${COMMON_DEPEND}
-	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
-}
-
-src_test() {
-	virtx emake check
-}
diff --git a/sys-block/gparted/gparted-1.2.0.ebuild b/sys-block/gparted/gparted-1.2.0.ebuild
deleted file mode 100644
index 2990599fa1ef..000000000000
--- a/sys-block/gparted/gparted-1.2.0.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome2 optfeature virtualx
-
-DESCRIPTION="Gnome Partition Editor"
-HOMEPAGE="https://gparted.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+ FDL-1.2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="kde policykit wayland"
-
-DEPEND="
-	!policykit? (
-		kde? ( >=kde-plasma/kde-cli-tools-5.8.6-r1[kdesu] ) )
-	policykit? ( >=sys-auth/polkit-0.102 )
-	>=dev-cpp/glibmm-2.56.1:2
-	>=dev-cpp/gtkmm-3.24:3.0
-	>=dev-libs/glib-2.58.3-r1:2
-	>=sys-block/parted-3.2:=
-	>=dev-libs/libsigc++-2.10.1:2
-"
-RDEPEND="${DEPEND}
-	>=sys-apps/util-linux-2.33.2
-	wayland? ( x11-apps/xhost )
-"
-BDEPEND="
-	app-text/docbook-xml-dtd:4.1.2
-	>=dev-util/intltool-0.51.0-r2
-	dev-util/itstool
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_configure() {
-	gnome2_src_configure \
-		--enable-doc \
-		--enable-online-resize \
-		$(use_enable wayland xhost-root) \
-		GKSUPROG=kdesu \
-		ac_cv_prog_have_scrollkeeper_update=no
-}
-
-src_install() {
-	gnome2_src_install
-
-	local _ddir="${D}"/usr/share/applications
-	local _bdir="${D}"/usr/bin
-
-	if ! use policykit; then
-		if use kde; then
-			cp "${_ddir}"/gparted{,-kde}.desktop || die
-			cp "${_bdir}"/gparted{,-kde} || die
-			sed -i -e '/Exec/ s:gparted:gparted-kde:' "${_ddir}"/gparted-kde.desktop || die
-			echo 'OnlyShowIn=KDE;' >> "${_ddir}"/gparted-kde.desktop || die
-		fi
-	else
-		sed -i -e 's:kdesu::' "${_bdir}"/gparted || die
-	fi
-
-	mv "${ED}"/usr/share/{appdata,metainfo}
-}
-
-src_test() {
-	virtx emake check
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	optfeature_header
-	optfeature "BTRFS support"                   sys-fs/btrfs-progs
-	optfeature "DMRAID support"                  sys-fs/dmraid sys-fs/multipath-tools
-	optfeature "Encrypted device / LUKS support" sys-fs/cryptsetup
-	optfeature "exFAT support"                   sys-fs/exfatprogs
-	optfeature "EXT2/EXT3/EXT4 support"          sys-fs/e2fsprogs
-	optfeature "F2FS support"                    sys-fs/f2fs-tools
-	optfeature "FAT support"                     sys-fs/dosfstools sys-fs/mtools
-	optfeature "HFS support"                     sys-fs/diskdev_cmds sys-fs/hfsutils virtual/udev
-	optfeature "JFS support"                     sys-fs/jfsutils
-	optfeature "MDADM support"                   sys-fs/mdadm
-	optfeature "NTFS support"                    sys-fs/ntfs3g[ntfsprogs]
-	optfeature "Reiser4 support"                 sys-fs/reiser4progs
-	optfeature "ReiserFS support"                sys-fs/reiserfsprogs
-	optfeature "UDF support"                     sys-fs/udftools
-	optfeature "XFS support"                     sys-fs/xfsprogs sys-fs/xfsdump
-}
diff --git a/sys-block/gparted/gparted-1.3.0.ebuild b/sys-block/gparted/gparted-1.3.0.ebuild
index 2990599fa1ef..c997458d21a1 100644
--- a/sys-block/gparted/gparted-1.3.0.ebuild
+++ b/sys-block/gparted/gparted-1.3.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 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
 IUSE="kde policykit wayland"
 
 DEPEND="
diff --git a/sys-block/gparted/metadata.xml b/sys-block/gparted/metadata.xml
index 034dee83491c..d1c4e683f793 100644
--- a/sys-block/gparted/metadata.xml
+++ b/sys-block/gparted/metadata.xml
@@ -14,27 +14,8 @@
 	déplacer et copier différents systèmes de fichiers.
 	</longdescription>
 	<use>
-		<flag name="btrfs">Include Btrfs support (<pkg>sys-fs/btrfs-progs</pkg>)</flag>
-		<flag name="cryptsetup">Include LUKS volume support (<pkg>sys-fs/cryptsetup</pkg>)</flag>
-		<flag name="dmraid">Support for dmraid devices, also known as ATA-RAID, or
-		Fake RAID.</flag>
-		<flag name="f2fs">Include F2FS support (<pkg>sys-fs/f2fs-tools</pkg>)
-		</flag>
-		<flag name="fat">Include FAT16/FAT32 support (<pkg>sys-fs/dosfstools</pkg>)
-		</flag>
-		<flag name="hfs">Include HFS support (<pkg>sys-fs/hfsutils</pkg>)</flag>
-		<flag name="jfs">Include JFS support (<pkg>sys-fs/jfsutils</pkg>)</flag>
-		<flag name="mdadm">Support for Linux software RAID.</flag>
-		<flag name="ntfs">Include NTFS support (<pkg>sys-fs/ntfs3g</pkg>)</flag>
-		<flag name="reiser4">Include ReiserFS4 support
-		(<pkg>sys-fs/reiser4progs</pkg>)</flag>
-		<flag name="reiserfs">Include ReiserFS support
-		(<pkg>sys-fs/reiserfsprogs</pkg>)</flag>
-		<flag name="udf">Include UDF support (<pkg>sys-fs/udftools</pkg>)</flag>
 		<flag name="wayland">Enable interim workaround to allow running GParted under
 		Wayland by granting permission to the X11 display using <pkg>x11-apps/xhost</pkg>.</flag>
-		<flag name="xfs">Include XFS support
-		(<pkg>sys-fs/xfsprogs</pkg>, <pkg>sys-fs/xfsdump</pkg>)</flag>
 	</use>
 	<upstream>
 		<remote-id type="sourceforge">gparted</remote-id>
diff --git a/sys-block/open-iscsi/Manifest b/sys-block/open-iscsi/Manifest
index 2cf7963aa5ca..f31661a60798 100644
--- a/sys-block/open-iscsi/Manifest
+++ b/sys-block/open-iscsi/Manifest
@@ -1,17 +1,9 @@
-AUX 99-iscsi.rules 82 BLAKE2B 675eb7ef4e4b9b158dc7108f6d0973ebe18e9d154234a52e264cb81816eb3177ac4eb7249a1ed8a342e2abafc2e11dd386301167ff70ba8eac98a8f81629701f SHA512 1b6c226c836ddfb43c7228984a9062dedbe23ef5f9f97ed37cbb9c28cb9b4b6a7fd4ae2cce169609ee5ed692ad56a675cfe149645a80af7d692d841d6fd12bfd
 AUX initiatorname.iscsi 1152 BLAKE2B 32ddfef007a3cef2c22c6f49319587065d527000d0d53d9c588c2935b2e94c1396d5113837c8f2cf6a4e2b7d5c25504b6d652520d2155a9ae832ea716dede8ba SHA512 3abd69a3b070695a96e753fb02356a53e1a59f466e7ad87cbb64cfac58761df37e7c950c5c1ac13209e6e64f1a25d88969a4d8a7d698aa32100e9e55495fba5e
 AUX iscsid-conf.d 422 BLAKE2B 2871024472d5308b395aeb8c67f7b47aed4618790295d3ef7e51aaddd32f12fafbe1b8542fc8a34d5da0233a26ee557c7e9613fa8436d9c9312a9e2f6902a1e5 SHA512 d197bbe2ce610cc2d4a1269c8d7a067ca5e3b0f3d8bb0804c2c39e0cf512bcbf7b5de45b7d6ffd5cf918dc395c7cf32c40e64b4348d00a4d0223ee44c463709a
 AUX iscsid-init.d 2094 BLAKE2B e13fc820e74a79e3c1f220b827c3188b6cb3bc149f450e3ee668d851faacd59e1e44b51250ba3f53a321d287eb81b580a332605226564269dbcd3e2762c0c95e SHA512 a5544e35da3433dfde96984d2e5783991d961554b8843f4f96d4317a38d7534864882342633ed0dc15c2f9e49a419e51958593b0de1ce84644938dafabe392fc
-AUX iscsidev.sh 2119 BLAKE2B 60d71177fa788b942ece6d1a1d17b9157956ccd5a1781b022a56da6f13c9dc8485008fd3c6530ae9b798ce3034c9cc3c960d43a196bfb06b73746390a8af91e7 SHA512 b4ed7fad25e3f000134a77f3aea2702f03ff75e99ecf49e580085127ab58de5a64bea9c4fc2ae5b324deafd0a860494d1a8dc1223db7d3679b960552f0c00813
-AUX open-iscsi-2.0.874-Makefiles.patch 4087 BLAKE2B cba133471f1c22987cd8be4e7ea4629ef415f8a50da81fc53068745a85fff1aae0f82d9401035b3066906e9cab7d307249402bacc8cd767bf46d8d1a740061fb SHA512 c535a45c627aaa8fd168d4c96f782090b9ae829003ec59c6ead7f34d15f4e52c71916aa014209ac35fd3b29296bb46b603d8df2072be463c5fcc90338784665c
-AUX open-iscsi-2.0.874-musl-ethtool-compat.patch 2230 BLAKE2B fada90cbf8173364b795be4756805ac0ae45575b785796d6aec9eb6781003974b0d4450e758d42e45778672ba053122b533d8e56bb9c8db1fbf31aa7e8bfe6dc SHA512 09a3b828773e0d7c5d98f8ba8c0683bd1ef5fd83860fafaa75d89cce9e09cebc68bfaea62091aeadeb1d1adfe5318c0af9bfa0a74f2d802568abe1a59b4ebf03
-AUX open-iscsi-2.0.874-musl-fixes.patch 1478 BLAKE2B a58a8eec59c7dd05e121ab8213dad21d21cb33c91e8b4763816ce6fccc8f9d8f57d9e7bd246e3417e78da0ce61cade5a29433b2b44d025875cd2199dee2e6353 SHA512 264313bc8de01bcad1db858c0b99ca2c294c22eb1b2693e0445083a895afd0cdc9178ff2dad5de18628a6e61723ad5d2e0c0d4789ce07ccae131f575747aa382
-AUX open-iscsi-2.0.875-include-sysmacros.patch 603 BLAKE2B 9c3fcf3bfd0a2ee04c31dd01dbb50680bc9bb434523f0e298d55b762be11f0cd4ef5c7b254466859f755f9e733e8ceaa54795f7dc57518c5136be5ff8001cffe SHA512 686698edc063fbdc47f07dea76ef95e8ae1038eeb3f012f4b6bc098cb0740e9988fc45779e921f4f01ef418d505f194c427308927c67d7af06e03e12b1ae9064
 AUX open-iscsi-2.1.1-Makefiles.patch 2185 BLAKE2B ab4dc518f12f0975cf472c94dfa883e98dcce57b2d203c39730ee67c4e6b548ff6554dd4ec8ffd7a624aca99e38c88284ea1bd41cbf89f077e5017e4bc45fd5a SHA512 1b37cfde4889d2f00f91cd173cb323fcb131040ac14351bb66aa4b8250cb527334e869faac4b0fa1ee9160ed7f44ffe2c9cd9a78075d3fec2ca32e0c27c0ba4b
-DIST open-iscsi-2.0.875.tar.gz 635121 BLAKE2B 34a7083087c53ed0e59d293d26efe166b09c5ea18b6022869cc9ff3d2edb2fb8b69e2c1ce6c9011bd20fc590b02dafd6d7c13d8bfa1eae6408c4bace13992e5e SHA512 1709011d7d12d3dd9278a0d775af064d5f7da37357f35d6d5c5b3aa8ec16385c28b201b1261f4581dbbbbca3d815015ed8696e1694aa19f3231132f90d1e5b36
 DIST open-iscsi-2.1.3.tar.gz 619746 BLAKE2B 884e24ae6e16578f3cbd8ccea2557e820d4bf4d20c7f88890100ca93f48df88dc7284cc4eca19d93187516fd21a2c5b71eb53f0d8fe395d2ce42fd202dc355d6 SHA512 0de417dc45b765458c5a1f09029b5df9b5c18d45d7a8fb6b38d539b7013f512a3c8731d5046f554611eccc77b93fea0df30fe4932d79cea44776ac944c398a52
 DIST open-iscsi-2.1.4.tar.gz 621247 BLAKE2B 043a999b2f397a6c740d61654079d7ab966caee6cf6cfb244ddd70eae4f5201045b371ce5fbe244216a2a210a5379c92e8c3fbe62d33707cf05e7a4a20a13a91 SHA512 ae0663a964d86e6a4c19203598b859173c93ecce550f9bc9855ff735dd51a3c45822f2bc1cc99e6891c56ef1d16c42223803f07a961558fe6e38ead2164faef3
-EBUILD open-iscsi-2.0.875.ebuild 3749 BLAKE2B f87b689602c5f245040ef9f89fbfa8bb8da2e779017d810830e7e85df70aa49abb8db1edcd626303e1f4381ebe258bc6f706e824dd2e16d145ee330057ee83e2 SHA512 17de23c096ee31f142764bc055a9f13116b27ade9519566016273acbae4b4d1e8c703e1a9bf2aa1f70285309e30323555648eba165c20ab3b9676af4bd5f90d3
 EBUILD open-iscsi-2.1.3.ebuild 3966 BLAKE2B bfd38d26723544c6105d314439171d7a57a0a5570764e78aa56d897d7c7bac6cef1e9cbd03a098be2203a68791013800b09f9145e3bfe7f59cfdbb620f66325b SHA512 05557c00940c49ee23fc764be2a7179be2a57a6590c5f51be9079dffca3887697e36574a8c6382f34f5754de484d1b72d89a66ebbf725e6e887a12f3c3bd5fc1
 EBUILD open-iscsi-2.1.4-r1.ebuild 3995 BLAKE2B 23e00f5793c64838e6b41994ccc3917f6dc3d4862f40bba19ff0964dac000d1e84c1760363384a39af09f929b3dbadc235abc69843a91c6844d82300d7939e13 SHA512 06bf03dd81e8b121eaff611d1f3467775def562b5d32a270114262475ea6f0639464048fa7f5a36e2a917f8215c91dab96e78570183f212167da0da86cb980bf
 MISC metadata.xml 458 BLAKE2B 78071dafcae7bfa7045dcc2724e55ffa92b12658356bdc0a7b7f01214a7681c265a986bc7113e9b4f5f73f3a795a11ba88a2040f0e791129cdd89c70c6dfbaf7 SHA512 3a84213f60f1baee774962a70a4f5f2dbd5f8f353e746a88217451d409561613d6656b56ea1e917441dd300a0945441473f1b090b16d40d8887ad5680dc59c01
diff --git a/sys-block/open-iscsi/files/99-iscsi.rules b/sys-block/open-iscsi/files/99-iscsi.rules
deleted file mode 100644
index 3816126264c7..000000000000
--- a/sys-block/open-iscsi/files/99-iscsi.rules
+++ /dev/null
@@ -1 +0,0 @@
-KERNEL=="sd*", SUBSYSTEMS=="block", RUN{program}+="/etc/udev/scripts/iscsidev.sh"
diff --git a/sys-block/open-iscsi/files/iscsidev.sh b/sys-block/open-iscsi/files/iscsidev.sh
deleted file mode 100644
index d045fae570fc..000000000000
--- a/sys-block/open-iscsi/files/iscsidev.sh
+++ /dev/null
@@ -1,78 +0,0 @@
-#!/usr/bin/env bash
-
-# KERNEL=="sd*", SUBSYSTEMS=="block", RUN{program}="/etc/udev/scripts/iscsidev.sh"
-
-# we only care about iscsi devices
-[[ $ID_VENDOR = "IET" ]] || exit 1
-
-# don't care about partitions either
-echo $DEVNAME | egrep -q "[0-9]$"
-status=$?
-[[ $status != 0 ]] || exit 1
-
-#ID_MODEL=VIRTUAL-DISK
-#ID_MODEL_ENC=VIRTUAL-DISK
-#ID_REVISION=0001
-#DEVTYPE=disk
-#ID_BUS=scsi
-#SUBSYSTEM=block
-#ID_SERIAL=1IET_00010001
-#DEVPATH=/devices/platform/host74/session68/target74:0:0/74:0:0:1/block/sde
-#ID_VENDOR_ENC=IET\x20\x20\x20\x20\x20
-#MINOR=64
-#ID_SCSI=1
-#ACTION=add
-#PWD=/
-#ID_PART_TABLE_UUID=54f71c65-a5d5-45cd-8915-5ffd5ff4fea6
-#ID_FS_TYPE=
-#USEC_INITIALIZED=999037905
-#MAJOR=8
-#ID_SCSI_SERIAL=beaf11
-#DEVLINKS=/dev/disk/by-id/scsi-1IET_00010001
-#DEVNAME=/dev/sde
-#SHLVL=1
-#ID_TYPE=disk
-#ID_PART_TABLE_TYPE=gpt
-#ID_VENDOR=IET
-#ID_SERIAL_SHORT=IET_00010001
-#SEQNUM=25775
-
-# do the removal
-if [[ $ACTION = 'remove' ]]; then
-  # nohup needed so this isn't constantly run...
-  nohup find -L /dev/disk/by-path/ -type l -lname ${DEVNAME} -exec rm "{}" + 2>/dev/null &
-  exit 0
-fi
-
-TARGET_NAME=$(lsscsi -t | grep "${DEVNAME}" | awk '{print $3}' | awk -F, '{print $1}')
-[[ $TARGET_NAME = '' ]] && exit 1
-
-# we don't know which host is correct
-declare -a POSSIBLE_HOSTS
-declare -a POSSIBLE_PORTS
-for item in $(cat /sys/class/iscsi_connection/connection*/address); do
-  POSSIBLE_HOSTS+=("${item}")
-done
-for item in $(cat /sys/class/iscsi_connection/connection*/port); do
-  POSSIBLE_PORTS+=("${item}")
-done
-
-#get correct ip and port
-for ((i=0;i<${#POSSIBLE_HOSTS[@]};++i)); do
-  printf "%s is in %s\n" "$POSSIBLE_HOSTS[i]}" "${POSSIBLE_PORTS[i]}"
-  iscsiadm --mode node --targetname "${TARGET_NAME}" -p "${POSSIBLE_HOSTS[i]}":"${POSSIBLE_PORTS[i]}"
-  status=$?
-  if [[ $status = 0 ]]; then
-    TARGET_IP="${POSSIBLE_HOSTS[i]}"
-    TARGET_PORT="${POSSIBLE_PORTS[i]}"
-    break
-  fi
-done
-
-# exit if not found
-[[ -z $TARGET_IP ]] && exit 1
-[[ -z $TARGET_PORT ]] && exit 1
-
-# actually create the link
-mkdir -p /dev/disk/by-path/
-ln -s "${DEVNAME}" "/dev/disk/by-path/ip-${TARGET_IP}:${TARGET_PORT}-iscsi-${TARGET_NAME}-lun-1"
diff --git a/sys-block/open-iscsi/files/open-iscsi-2.0.874-Makefiles.patch b/sys-block/open-iscsi/files/open-iscsi-2.0.874-Makefiles.patch
deleted file mode 100644
index 33c5d8a960d0..000000000000
--- a/sys-block/open-iscsi/files/open-iscsi-2.0.874-Makefiles.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-diff -dur a/Makefile b/Makefile
---- a/Makefile	2016-09-29 13:33:24.000000000 -0500
-+++ b/Makefile	2017-01-02 11:25:04.606549073 -0600
-@@ -14,8 +14,8 @@
- etcdir = /etc
- initddir = $(etcdir)/init.d
- 
--MANPAGES = doc/iscsid.8 doc/iscsiadm.8 doc/iscsi_discovery.8 iscsiuio/docs/iscsiuio.8
--PROGRAMS = usr/iscsid usr/iscsiadm utils/iscsi_discovery utils/iscsi-iname iscsiuio/src/unix/iscsiuio
-+MANPAGES = doc/iscsid.8 doc/iscsiadm.8 doc/iscsi_discovery.8 doc/iscsistart.8 doc/iscsi-iname.8
-+PROGRAMS = usr/iscsid usr/iscsiadm utils/iscsi_discovery utils/iscsi-iname usr/iscsistart
- INSTALL = install
- ETCFILES = etc/iscsid.conf
- IFACEFILES = etc/iface.example
-@@ -99,11 +99,11 @@
- # ugh, auto-detection is evil
- # Gentoo maintains their own init.d stuff
- install_initd:
--	if [ -f /etc/debian_version ]; then \
-+	if [ -f $(DESTDIR)$(etcdir)/debian_version ]; then \
- 		$(MAKE) install_initd_debian ; \
--	elif [ -f /etc/redhat-release ]; then \
-+	elif [ -f $(DESTDIR)$(etcdir)/redhat-release ]; then \
- 		$(MAKE) install_initd_redhat ; \
--	elif [ -f /etc/SuSE-release ]; then \
-+	elif [ -f $(DESTDIR)$(etcdir)/SuSE-release ]; then \
- 		$(MAKE) install_initd_suse ; \
- 	fi
- 
-@@ -130,7 +130,7 @@
- 	$(INSTALL) -m 644 $^ $(DESTDIR)$(etcdir)/iscsi/ifaces
- 
- install_etc: $(ETCFILES)
--	if [ ! -f $(DESTDIR)/etc/iscsi/iscsid.conf ]; then \
-+	if [ ! -f $(DESTDIR)$(etcdir)/iscsi/iscsid.conf ]; then \
- 		$(INSTALL) -d $(DESTDIR)$(etcdir)/iscsi ; \
- 		$(INSTALL) -m 644 $^ $(DESTDIR)$(etcdir)/iscsi ; \
- 	fi
-@@ -143,11 +143,11 @@
- 	$(MAKE) -C kernel install_kernel
- 
- install_iname:
--	if [ ! -f $(DESTDIR)/etc/iscsi/initiatorname.iscsi ]; then \
--		echo "InitiatorName=`$(DESTDIR)/sbin/iscsi-iname`" > $(DESTDIR)/etc/iscsi/initiatorname.iscsi ; \
-+	if [ ! -f $(DESTDIR)$(etcdir)/iscsi/initiatorname.iscsi ]; then \
-+		echo "InitiatorName=`$(DESTDIR)$(sbindir)/iscsi-iname`" > $(DESTDIR)$(etcdir)/iscsi/initiatorname.iscsi ; \
- 		echo "***************************************************" ; \
--		echo "Setting InitiatorName to `cat $(DESTDIR)/etc/iscsi/initiatorname.iscsi`" ; \
--		echo "To override edit $(DESTDIR)/etc/iscsi/initiatorname.iscsi" ; \
-+		echo "Setting InitiatorName to `cat $(DESTDIR)$(etcdir)/iscsi/initiatorname.iscsi`" ; \
-+		echo "To override edit $(etcdir)/iscsi/initiatorname.iscsi" ; \
- 		echo "***************************************************" ; \
- 	fi
- 
-diff -dur a/usr/Makefile b/usr/Makefile
---- a/usr/Makefile	2016-09-29 13:33:24.000000000 -0500
-+++ b/usr/Makefile	2017-01-02 11:27:55.417297639 -0600
-@@ -63,9 +63,9 @@
- 		iscsistart.o statics.o
- 	$(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ -lrt
- clean:
--	rm -f *.o $(PROGRAMS) .depend $(LIBSYS)
-+	$(RM) *.o $(PROGRAMS) .depend $(LIBSYS)
- 
- depend:
--	gcc $(CFLAGS) -M `ls *.c` > .depend
-+	$(CC) $(CFLAGS) -M `ls *.c` > .depend
- 
- -include .depend
-diff -dur a/utils/fwparam_ibft/Makefile b/utils/fwparam_ibft/Makefile
---- a/utils/fwparam_ibft/Makefile	2016-09-29 13:33:24.000000000 -0500
-+++ b/utils/fwparam_ibft/Makefile	2017-01-02 11:30:42.358440507 -0600
-@@ -33,11 +33,11 @@
- all: $(OBJS)
- 
- clean:
--	rm -f *.o $(CLEANFILES) .depend
-+	$(RM) *.o $(CLEANFILES) .depend
- 
- $(OBJS): prom_parse.tab.h prom_parse.h fwparam_ibft.h
- 
- depend:
--	gcc $(CFLAGS) -M `ls *.c` > .depend
-+	$(CC) $(CFLAGS) -M `ls *.c` > .depend
- 
- -include .depend
-diff -dur a/utils/Makefile b/utils/Makefile
---- a/utils/Makefile	2016-09-29 13:33:24.000000000 -0500
-+++ b/utils/Makefile	2017-01-02 11:29:24.193611039 -0600
-@@ -10,9 +10,9 @@
- 	$(CC) $(CFLAGS) $(LDFLAGS) $^ $(DBM_LIB) -o $@
- 
- clean:
--	rm -f *.o $(PROGRAMS) .depend
-+	$(RM) *.o $(PROGRAMS) .depend
- 
- depend:
--	gcc $(CFLAGS) -M `ls *.c` > .depend
-+	$(GCC) $(CFLAGS) -M `ls *.c` > .depend
- 
- -include .depend
-diff -dur a/utils/sysdeps/Makefile b/utils/sysdeps/Makefile
---- a/utils/sysdeps/Makefile	2016-09-29 13:33:24.000000000 -0500
-+++ b/utils/sysdeps/Makefile	2017-01-02 11:31:24.219926338 -0600
-@@ -8,9 +8,9 @@
- all: $(SYSDEPS_OBJS)
- 
- clean:
--	rm -f *.o .depend
-+	$(RM) *.o .depend
- 
- depend:
--	gcc $(CFLAGS) -M `ls *.c` > .depend
-+	$(CC) $(CFLAGS) -M `ls *.c` > .depend
- 
- -include .depend
diff --git a/sys-block/open-iscsi/files/open-iscsi-2.0.874-musl-ethtool-compat.patch b/sys-block/open-iscsi/files/open-iscsi-2.0.874-musl-ethtool-compat.patch
deleted file mode 100644
index 12b82c71405c..000000000000
--- a/sys-block/open-iscsi/files/open-iscsi-2.0.874-musl-ethtool-compat.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From: Anthony G. Basiel <blueness@gentoo.org>
-
-diff -Naur open-iscsi-2.0.874.orig/iscsiuio/src/unix/libs/bnx2x.c open-iscsi-2.0.874/iscsiuio/src/unix/libs/bnx2x.c
---- open-iscsi-2.0.874.orig/iscsiuio/src/unix/libs/bnx2x.c	2016-09-29 18:33:24.000000000 +0000
-+++ open-iscsi-2.0.874/iscsiuio/src/unix/libs/bnx2x.c	2017-01-03 21:45:47.504035833 +0000
-@@ -42,7 +42,7 @@
- #include <arpa/inet.h>
- #include <linux/types.h>	/* Needed for linux/ethtool.h on RHEL 5.x */
- #include <linux/sockios.h>
--#include <linux/ethtool.h>
-+#include "ethtool-compat.h"
- #include <sys/mman.h>
- #include <sys/ioctl.h>
- #include <sys/types.h>
-diff -Naur open-iscsi-2.0.874.orig/iscsiuio/src/unix/libs/ethtool-compat.h open-iscsi-2.0.874/iscsiuio/src/unix/libs/ethtool-compat.h
---- open-iscsi-2.0.874.orig/iscsiuio/src/unix/libs/ethtool-compat.h	1970-01-01 00:00:00.000000000 +0000
-+++ open-iscsi-2.0.874/iscsiuio/src/unix/libs/ethtool-compat.h	2017-01-03 21:45:23.016034980 +0000
-@@ -0,0 +1,51 @@
-+/*
-+ * ethtool-compat.h: adopted from
-+ # ethtool.h: Defines for Linux ethtool.
-+ *
-+ * Copyright (C) 1998 David S. Miller (davem@redhat.com)
-+ * Copyright 2001 Jeff Garzik <jgarzik@pobox.com>
-+ * Portions Copyright 2001 Sun Microsystems (thockin@sun.com)
-+ * Portions Copyright 2002 Intel (eli.kupermann@intel.com,
-+ *                                christopher.leech@intel.com,
-+ *                                scott.feldman@intel.com)
-+ * Portions Copyright (C) Sun Microsystems 2008
-+ */
-+
-+#include <linux/types.h>
-+#include <netinet/if_ether.h>
-+
-+#define ETHTOOL_FWVERS_LEN	32
-+#define ETHTOOL_BUSINFO_LEN	32
-+#define ETHTOOL_EROMVERS_LEN	32
-+
-+struct ethtool_drvinfo {
-+	__u32	cmd;
-+	char	driver[32];
-+	char	version[32];
-+	char	fw_version[ETHTOOL_FWVERS_LEN];
-+	char	bus_info[ETHTOOL_BUSINFO_LEN];
-+	char	erom_version[ETHTOOL_EROMVERS_LEN];
-+	char	reserved2[12];
-+	__u32	n_priv_flags;
-+	__u32	n_stats;
-+	__u32	testinfo_len;
-+	__u32	eedump_len;
-+	__u32	regdump_len;
-+};
-+
-+struct ethtool_tcpip4_spec {
-+	__be32	ip4src;
-+	__be32	ip4dst;
-+	__be16	psrc;
-+	__be16	pdst;
-+	__u8    tos;
-+};
-+
-+struct ethtool_ah_espip4_spec {
-+	__be32	ip4src;
-+	__be32	ip4dst;
-+	__be32	spi;
-+	__u8    tos;
-+};
-+
-+#define ETHTOOL_GDRVINFO	0x00000003 /* Get driver info. */
diff --git a/sys-block/open-iscsi/files/open-iscsi-2.0.874-musl-fixes.patch b/sys-block/open-iscsi/files/open-iscsi-2.0.874-musl-fixes.patch
deleted file mode 100644
index cf8b76210b99..000000000000
--- a/sys-block/open-iscsi/files/open-iscsi-2.0.874-musl-fixes.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- ./utils/fwparam_ibft/fwparam_ppc.c	2016-09-29 13:33:24.000000000 -0500
-+++ ./utils/fwparam_ibft/fwparam_ppc.c	2017-01-02 11:37:32.738351217 -0600
-@@ -356,7 +356,7 @@
- 	 * Sort the nics into "natural" order.	The proc fs
- 	 * device-tree has them in somewhat random, or reversed order.
- 	 */
--	qsort(niclist, nic_count, sizeof(char *), (__compar_fn_t)nic_cmp);
-+	qsort(niclist, nic_count, sizeof(char *), (int (*)(const void *, const void *))nic_cmp);
- 
- 	snprintf(prefix, sizeof(prefix), "%s/%s", devtree, "aliases");
- 	dev_count = 0;
---- ./usr/idbm.c.orig
-+++ ./usr/idbm.c
-@@ -25,6 +25,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <errno.h>
-+#include <fcntl.h>
- #include <dirent.h>
- #include <limits.h>
- #include <sys/stat.h>
---- a/usr/iscsiadm.c	2016-09-29 13:33:24.000000000 -0500
-+++ b/usr/iscsiadm.c	2017-01-02 11:46:37.643506953 -0600
-@@ -3262,6 +3262,7 @@
- 	int tpgt = PORTAL_GROUP_TAG_UNKNOWN, killiscsid=-1, do_show=0;
- 	int packet_size=32, ping_count=1, ping_interval=0;
- 	int do_discover = 0, sub_mode = -1;
-+	int argerror = 0;
- 	int portal_type = -1;
- 	struct sigaction sa_old;
- 	struct sigaction sa_new;
-@@ -3426,6 +3427,9 @@
- 			break;
- 		case 'h':
- 			usage(0);
-+		case '?':
-+			log_error("unrecognized character '%c'", optopt);
-+			argerror = 1;
- 		}
- 
- 		if (name && value) {
-@@ -3441,8 +3445,7 @@
- 		}
- 	}
- 
--	if (optopt) {
--		log_error("unrecognized character '%c'", optopt);
-+	if (argerror) {
- 		rc = ISCSI_ERR_INVAL;
- 		goto free_ifaces;
- 	}
diff --git a/sys-block/open-iscsi/files/open-iscsi-2.0.875-include-sysmacros.patch b/sys-block/open-iscsi/files/open-iscsi-2.0.875-include-sysmacros.patch
deleted file mode 100644
index 7c19a1e6ba23..000000000000
--- a/sys-block/open-iscsi/files/open-iscsi-2.0.875-include-sysmacros.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 6d68ef5871c94c6ebbbe6e6b1fe0bc2dce711052 Mon Sep 17 00:00:00 2001
-From: Lee Duncan <lduncan@suse.com>
-Date: Sat, 2 Dec 2017 14:19:26 -0800
-Subject: [PATCH] Include <sys/sysmacros.h> to properly define minor()
-
----
- iscsiuio/src/unix/libs/qedi.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/iscsiuio/src/unix/libs/qedi.c b/iscsiuio/src/unix/libs/qedi.c
-index c6ff6e77..b81fecdf 100644
---- a/iscsiuio/src/unix/libs/qedi.c
-+++ b/iscsiuio/src/unix/libs/qedi.c
-@@ -58,6 +58,7 @@
- #include <sys/user.h>
- #include <fcntl.h>
- #include <unistd.h>
-+#include <sys/sysmacros.h>
- 
- #include "config.h"
- 
diff --git a/sys-block/open-iscsi/open-iscsi-2.0.875.ebuild b/sys-block/open-iscsi/open-iscsi-2.0.875.ebuild
deleted file mode 100644
index d92237185ef9..000000000000
--- a/sys-block/open-iscsi/open-iscsi-2.0.875.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools versionator 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/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE="debug infiniband +tcp rdma"
-
-DEPEND="sys-block/open-isns:=
-	infiniband? ( sys-fabric/ofed )
-	sys-kernel/linux-headers"
-RDEPEND="${DEPEND}
-	sys-fs/lsscsi
-	sys-apps/util-linux"
-REQUIRED_USE="infiniband? ( rdma ) || ( rdma tcp )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.0.874-Makefiles.patch"
-	"${FILESDIR}/${PN}-2.0.874-musl-fixes.patch"
-	"${FILESDIR}/${PN}-2.0.874-musl-ethtool-compat.patch"
-	"${FILESDIR}/${P}-include-sysmacros.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 -i -e 's:^\(iscsid.startup\)\s*=.*:\1 = /usr/sbin/iscsid:' etc/iscsid.conf || die
-	default
-
-	pushd iscsiuio >/dev/null || die
-	eautoreconf
-	popd >/dev/null || die
-}
-
-src_configure() {
-	use debug && append-cppflags -DDEBUG_TCP -DDEBUG_SCSI
-
-	# bug #643122
-	append-flags -fcommon
-
-	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}" \
-		AR="$(tc-getAR)" CC="$(tc-getCC)" \
-		user
-}
-
-src_install() {
-	emake DESTDIR="${ED}" sbindir="/usr/sbin" install
-	# Upstream make is not deterministic, per bug #601514
-	rm -f "${ED}"/etc/initiatorname.iscsi
-
-	dodoc README THANKS
-
-	docinto test/
-	dodoc test/*
-
-	insinto /etc/iscsi
-	newins "${FILESDIR}"/initiatorname.iscsi initiatorname.iscsi.example
-
-	newconfd "${FILESDIR}"/iscsid-conf.d iscsid
-	newinitd "${FILESDIR}"/iscsid-init.d iscsid
-
-	systemd_dounit "${S%/}"/etc/systemd/iscsid.service
-
-	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}" -a -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/parted/Manifest b/sys-block/parted/Manifest
index 6831336d7995..f6d39bf3d7f5 100644
--- a/sys-block/parted/Manifest
+++ b/sys-block/parted/Manifest
@@ -2,5 +2,5 @@ AUX parted-3.2-po4a-mandir.patch 275 BLAKE2B 5342cc776f557c9ef95604eb2c15ad484c4
 AUX parted-3.3-atari.patch 421 BLAKE2B 9048176f882e66cf89cc2d79aa0ea7a550f9c649d8f54f4df102eb361c6e0be473a2e07e1ab8f63dc446422a92ced10cfb4858a27b7988c1b5a960e6e8e1d518 SHA512 59738de6f89dd6d407eef139ffe4d0925d418f4d33a30a1ead1e1f05ab7ad93e13294412d5061dd40302b9592a33b97f137089f477dc6a2febd3fe60eae77ca0
 DIST parted-3.4.tar.xz 1860300 BLAKE2B c724d3d1490c62d440b9e5dc359fef7ff623bc77ae5f867d8905245cb279ec391fa07a1a774488ad3bf7a2c477007264d7bab2635a544be8f94dc706a654a711 SHA512 e69bd1b610778e980d4595d04892f2ea1faf4ae9bfc98cd62abfc70066423f08ddaa396f9461c7beb1330d023232274606b6b26091a0458aeedd0f3f57536690
 DIST parted-3.4.tar.xz.sig 508 BLAKE2B 112ad0158b1100bd9150a7c87e8f93e67d42870b82a17d4d0aa8bb5e46306f837f3f99feabaf301f8cd640c299174e5f5acf152dd1f20ea2b7ace73d57d31f14 SHA512 6b11812267e66470ba2908ee1cc78b232b0bc2519787f5a17b92cd5f8ba904b1a836833f19c5244b23d4c7810437eeb26fbbd68fac819391b342709682345472
-EBUILD parted-3.4.ebuild 1460 BLAKE2B 35e26bf48c88c03dd256b7dd082c8ef44aab950be080f24caeba2d7b833027e52f4e1099d676a9e44cfa595a3e9a1f0c9a78921160c0de758faea385f159e224 SHA512 f2f70c5fe1f322d453a99ad8b0ac9eab53ae204c3fccae21fe611c2599394cfb432fe8a906ac4460ef13438d2d2916f4e4e138bef491f32ae7d6aa1b8fc04386
+EBUILD parted-3.4.ebuild 1467 BLAKE2B 255a22fd0e407793f428091bd6c64f18f709e254d020a98ebe7b25eda24ef98b9acd00a7f90f811800e56dfd99067038f1cd78e6ef36978b5ee88146bc6ad4a7 SHA512 d887a2dd9fba74ce72a43275d4e00da42f0993157ad73347364c9b032a9829a52671e8b5caf788bb974b68bc7c73130e6c44a8a0a61fc4384980e03e69237fd9
 MISC metadata.xml 886 BLAKE2B 7eab7ab0acb3ca62dbd119ebdccad3a0a5aa69754edbc7465182496bfd136cdd06a7f12c8515ff2c9420dd22b9a4c03ca7f126b357f146af3825bf8e76064149 SHA512 aad773c94d64b99d1f70f2e542e75c4795e1c58bfdc238eb50d0e0a7c10d1255af464b2c7ddea76bbee4b6af5f8d90e1c584f319cb290cbe85aa6c7c8e873e21
diff --git a/sys-block/parted/parted-3.4.ebuild b/sys-block/parted/parted-3.4.ebuild
index c245ec7ab09b..573a9aca4f70 100644
--- a/sys-block/parted/parted-3.4.ebuild
+++ b/sys-block/parted/parted-3.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="+debug device-mapper nls readline"
 
 RDEPEND="
diff --git a/sys-block/scsiping/Manifest b/sys-block/scsiping/Manifest
index 7d4aa8908167..13340f146924 100644
--- a/sys-block/scsiping/Manifest
+++ b/sys-block/scsiping/Manifest
@@ -1,3 +1,3 @@
 DIST scsiping-0.0.1.tgz 1633 BLAKE2B 81c59f3179e3108aca99f5526f27784c74e9e4a88f27cac316c68a31d979ff43acbc1d1f4733aa918b648f897fe2c211b873c69349a9c3ad63e4ab33219127cf SHA512 ba296f259399c61abecb72793753982ec8effd3ee3c7a1445f10449956b1d42443c989890f8a37e88db4d6bd12eae826b236cd84650cd19ea99602a13dcd9f20
-EBUILD scsiping-0.0.1-r1.ebuild 661 BLAKE2B 3907e3255180c144c10a97c8e6374c5a89c1c56ea3c7b54d138eb7824b596e952eb251a2c468f21eb73e9fd934dab4981b622d69f88a0c548d4e8ce94f6b63d5 SHA512 2f0542446fca9209fb43baca95e45f5e20e2d65131bf2d7cc822138e367209dd10637d4d790f774d2e2988f5fcb47ae57bbd08d86f1b202715aca00a2582474f
+EBUILD scsiping-0.0.1-r1.ebuild 623 BLAKE2B 0adc7819c4a83d64ab8228ad9100f88cf26734a3a9b2bb9eb0d5fd23863a0aed42ce40df0c08648b1e3c586ab6a2ec81f49ea8c9da0e04e03e9fe836465db2ae SHA512 38394e5a89be5dec0f7c94a16be20c41b64b3d8ac2c6d2c802cda548d935f443400ab222cff179cc4cff965cfb3d09992c11da49008316ef7e42b3b5ad37da15
 MISC metadata.xml 216 BLAKE2B 20531789dc11e43feee7ec315a0c1c7249fdf73764e29cb7d6db439826e9ff72f24a5cdb8eb7f1ab99bbb41fb6e4226874a1d1fa4185de52598602bb3b0479a3 SHA512 e881b59fe49746eb25ad66c258b41aba501e4eb563129093a3898ea970a20506e7898f7c355cfcf99605234962bf2c77c1309c258b9a2b84ee4302ccb71c9dbd
diff --git a/sys-block/scsiping/scsiping-0.0.1-r1.ebuild b/sys-block/scsiping/scsiping-0.0.1-r1.ebuild
index c2d0e0095790..c3cc60f5cb01 100644
--- a/sys-block/scsiping/scsiping-0.0.1-r1.ebuild
+++ b/sys-block/scsiping/scsiping-0.0.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,12 +6,10 @@ EAPI=7
 DESCRIPTION="SCSIPing pings a host on the SCSI-chain"
 HOMEPAGE="https://www.vanheusden.com/Linux/"
 SRC_URI="https://www.vanheusden.com/Linux/${P}.tgz"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
-IUSE=""
-RDEPEND=""
-DEPEND="${RDEPEND}"
 
 src_prepare() {
 	sed -i -e '/strip scsiping/d' "${S}"/Makefile
diff --git a/sys-block/thin-provisioning-tools/Manifest b/sys-block/thin-provisioning-tools/Manifest
index 2e0689ac7a4d..150654116d20 100644
--- a/sys-block/thin-provisioning-tools/Manifest
+++ b/sys-block/thin-provisioning-tools/Manifest
@@ -1,12 +1,7 @@
 AUX thin-provisioning-tools-0.7.0-build-fixes.patch 1077 BLAKE2B 540efcaff8a0f826f132aa06b5d63728d5b7e0de2da81ff65480537c10b4a769330f0e557496f1ce6116cce51b834057ffb6c967fb527deb419aee4d1f3d2ec5 SHA512 fbdf778774bca2e608bbab7696b6646c64ee740c40c743f40f28e7e360fc2a6c6c3752992d9d5f7bbb624a9240ba480a6e58a7c5956ba6d2b772ece18502afe7
-AUX thin-provisioning-tools-0.8.5-libaio-0.3.112.patch 2516 BLAKE2B 22c2293a00838a1207a0892e93985c8350b5d8f75d1e1eecab4d74346780be57d82f40a44f3cee49e14fbc7bb5d50f62b110c7a34295a0fa76f98374003e3feb SHA512 a53dab2e755221daf3c38602a537f32fc60128cffef60ad309711c8c4e528c5ea888f8904c5f34597f1df023b4ad0b82b609c944095f8e628d66519178a1ab52
 DIST thin-provisioning-tools-0.7.0.tar.gz 230595 BLAKE2B 00238a682f80600e3a5bb6d0d2a9662bd0fd3ae5404d5895427f169640b469780f554c22c6a93187058e6399c76ba14a6fa8d73f2bb09aa79927dd458b58ffa9 SHA512 cb6c44c7215aadd72292d73e2374d8c0c28566adcb10c7a3de83576dbd28649ebba6e2cc59945a28921e423540969cb21f648c37e375d68f48e56a8be4a4c7b8
-DIST thin-provisioning-tools-0.7.6.tar.gz 285428 BLAKE2B af74eff6d435f00e347872786fee8627f02844af122a9f1bf9ffd00234ce5275d3a61d9b4204313a19813cadbc0197bbeb9a1bd92d55992c6d9a03a299579e29 SHA512 395035b6f59fafb1c0f3e68750611e04f10223bc8d57b257e25c28c928647d1d2c6e94014b64ed90eeae1151fc7e5d23cf1aa428716e343338cb3c8fe55ed704
-DIST thin-provisioning-tools-0.8.5.tar.gz 305585 BLAKE2B 7e4bde537535db79e97ddab3cba775c89854362dac7da491c040badf5e3546d2e6ac4b8da8462edb59f50a2ecd95fe9c5e3349fca5e9acd588efaaf990617ca4 SHA512 1f9a1b6b9059f0b23ec3a00ddef223599292d447894316525f13b9c1e4f29d0371cb901d199cb503be4342555e016e5e6eb2d6e0e10c44b08e6c9478c573e1d4
 DIST thin-provisioning-tools-0.9.0.tar.gz 500998 BLAKE2B ac269fb6dfd1baf1572da27582ac2cd763b07aaac130a9467d05581e7a0ba1309d7dbf4c6095407111667e57af2e8183318d558ed23853f9c84b9c151c0878d9 SHA512 e1796fb3948847d72ca8247cae58017507c0a847a00201b93668eeb8fbfea4107c4c2affa5c211c149798a89b10474e83d2bd61a5545a668299be97aed591e0f
 EBUILD thin-provisioning-tools-0.7.0.ebuild 1288 BLAKE2B 1361f119e7c18515ea6bc034075a8cd4ad5c026b4911906acc6fd2c60906e076be05b918f1552ec92890ae09b3b48be20115ac8f2631896a2e6a96f057fdcb2f SHA512 e1c199e78b0101e3941a9d3917b4d263622001672c7e5051ca60d67932e6c1bed2a1e5cda46a81c529eb802c59b30fa14c09a1cf86dc7bdd57dcef779762b9fc
-EBUILD thin-provisioning-tools-0.7.6.ebuild 1297 BLAKE2B ec8c85608bca92e5eed6d3da57c6724c83104376aaddae5ab91f3548850eb7d32db91f234ab2bfdadfac609d068e34ae8942e405d923bad5d92204d64775c79a SHA512 b0dab6fe64614b808a020e18183b3c92e7603e20529880ba3cc3e26d156b62b05e7f50421d8ef97de1f7130f625dcc25c603f655d87201f84b45c0e0e176561c
-EBUILD thin-provisioning-tools-0.8.5.ebuild 1549 BLAKE2B 06bbfbb1dec6a16af86ce1e183d86f6564237f227cf1a270aab3fd2750f3906f060e60afc34fcd650f8f4e1d474854ac5f6f449c646f4f02163d2dabcbda1366 SHA512 a01f7de103b44acf7388da317b8f00930cece3b2743ca4619fb134b69868ac077fc3a01a70d1530c8e83b1c5b9ae7710e734548e1df8b9d7e73d375e0b3b0ed5
 EBUILD thin-provisioning-tools-0.9.0.ebuild 1519 BLAKE2B a8e33907e935326de0325b790def2a48b187b234e6ee7e85706453b6c82f2224879acd7281d7d692622f365c8a8ae69e0d312ee9163d25fe2ed6173047503a95 SHA512 dd496f25a9c496ee5edf56d3e1a7e54d41de664bb5db83eaa81e3782b3b7a664ee5c582ecc4bd5bf8e325aed961ca0f6e78abb82474836e0ecff0bddf7d347f6
 EBUILD thin-provisioning-tools-9999.ebuild 1522 BLAKE2B 61187386bcf5867145f37f75d15197a97048a7ddd67b0ac3a003e73ccdc470fcaca2faecee39ef5c60ffc6112de3ebf1809476ee2d8aafebcb77f43d3e2d7995 SHA512 980ab74b8c4b3a82c97d1d19a9ce92562e2d3b948b05f49297085b1f5298f5d870bc56c6781f727650cadb1ceb40e581b5acf7297c950182c6852ad98e362cea
 MISC metadata.xml 434 BLAKE2B ce8a3b7440aa5f690989729e202c836ff63833f449e5b302dd58db3b43107b698a5480d761310964ba143b665729ca6ab23417df6eda7f13f24df55427cafb7f SHA512 5a7275bd03045f680a2942a7da2685d4ad94ae1995a612e80c9b6fd4ec8530ad536592247d2e1f4162e49469b9c6139f8237de9d80cae9f339b5852042eab22d
diff --git a/sys-block/thin-provisioning-tools/files/thin-provisioning-tools-0.8.5-libaio-0.3.112.patch b/sys-block/thin-provisioning-tools/files/thin-provisioning-tools-0.8.5-libaio-0.3.112.patch
deleted file mode 100644
index af31b90a40b7..000000000000
--- a/sys-block/thin-provisioning-tools/files/thin-provisioning-tools-0.8.5-libaio-0.3.112.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From 6332962ee866f5289de87ab70cd3db863298982c Mon Sep 17 00:00:00 2001
-From: Joe Thornber <ejt@redhat.com>
-Date: Wed, 5 Jun 2019 15:02:05 +0100
-Subject: [PATCH] [ft-lib/bcache] rename raise() -> raise_()
-
-Name clash with signal.h on Debian and Gentoo.
----
- ft-lib/bcache.c | 16 ++++++++--------
- 1 file changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/ft-lib/bcache.c b/ft-lib/bcache.c
-index 0dca5031..ee5b6c59 100644
---- a/ft-lib/bcache.c
-+++ b/ft-lib/bcache.c
-@@ -31,7 +31,7 @@ static void warn(const char *fmt, ...)
- }
- 
- // FIXME: raise a condition somehow?
--static void raise(const char *fmt, ...)
-+static void raise_(const char *fmt, ...)
- {
- 	va_list ap;
- 
-@@ -51,7 +51,7 @@ static inline struct list_head *list_pop(struct list_head *head)
- 	struct list_head *l;
- 
- 	if (head->next == head)
--		raise("list is empty\n");
-+		raise_("list is empty\n");
- 
- 	l = head->next;
- 	list_del(l);
-@@ -98,7 +98,7 @@ static struct cb_set *cb_set_create(unsigned nr)
- static void cb_set_destroy(struct cb_set *cbs)
- {
- 	if (!list_empty(&cbs->allocated))
--		raise("async io still in flight");
-+		raise_("async io still in flight");
- 
- 	free(cbs->vec);
- 	free(cbs);
-@@ -713,13 +713,13 @@ struct bcache *bcache_simple(const char *path, unsigned nr_cache_blocks)
- 	uint64_t s;
- 
- 	if (fd < 0) {
--		raise("couldn't open cache file");
-+		raise_("couldn't open cache file");
- 		return NULL;
- 	}
- 
- 	r = fstat(fd, &info);
- 	if (r < 0) {
--		raise("couldn't stat cache file");
-+		raise_("couldn't stat cache file");
- 		return NULL;
- 	}
- 
-@@ -751,7 +751,7 @@ void bcache_destroy(struct bcache *cache)
- static void check_index(struct bcache *cache, block_address index)
- {
- 	if (index >= cache->nr_data_blocks)
--		raise("block out of bounds (%llu >= %llu)",
-+		raise_("block out of bounds (%llu >= %llu)",
- 		      (unsigned long long) index,
- 		      (unsigned long long) cache->nr_data_blocks);
- }
-@@ -802,7 +802,7 @@ static struct block *lookup_or_read_block(struct bcache *cache,
- 		// FIXME: this is insufficient.  We need to also catch a read
- 		// lock of a write locked block.  Ref count needs to distinguish.
- 		if (b->ref_count && (flags & (GF_DIRTY | GF_ZERO)))
--			raise("concurrent write lock attempt");
-+			raise_("concurrent write lock attempt");
- 
- 		if (test_flags(b, BF_IO_PENDING)) {
- 			miss(cache, flags);
-@@ -858,7 +858,7 @@ struct block *get_block(struct bcache *cache, block_address index, unsigned flag
- 		return b;
- 	}
- 
--	raise("couldn't get block");
-+	raise_("couldn't get block");
- 	return NULL;
- }
- 
diff --git a/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.7.6.ebuild b/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.7.6.ebuild
deleted file mode 100644
index 9488fd97cf6b..000000000000
--- a/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.7.6.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2020 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.5
-		>=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.8.5.ebuild b/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.8.5.ebuild
deleted file mode 100644
index 67967d50aa6a..000000000000
--- a/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.8.5.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic
-
-DESCRIPTION="A suite of tools for thin provisioning on Linux"
-HOMEPAGE="https://github.com/jthornber/thin-provisioning-tools"
-
-if [[ ${PV} != *9999 ]]; then
-	SRC_URI="https://github.com/jthornber/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-else
-	inherit git-r3
-	EGIT_REPO_URI='https://github.com/jthornber/thin-provisioning-tools.git'
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-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-lang/ruby:2.5
-		)
-		>=dev-cpp/gtest-1.8.0
-		dev-util/cucumber
-		dev-util/aruba
-	)
-	dev-libs/boost"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.7.0-build-fixes.patch
-	"${FILESDIR}"/${PN}-0.8.5-libaio-0.3.112.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	use static && append-ldflags -static
-	local myeconfargs=(
-		--prefix="${EPREFIX}"/
-		--bindir="${EPREFIX}"/sbin
-		--with-optimisation=''
-		$(use_enable test testing)
-	)
-	STRIP=true econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	MAKEOPTS+=" V="
-	default
-}
-
-src_test() {
-	emake unit-test
-}
-
-src_install() {
-	emake DESTDIR="${D}" DATADIR="${D}/usr/share" install
-	dodoc README.md TODO.org
-}