gentoo resync : 20.03.2022

author: V3n3RiX <venerix@koprulu.sector> 2022-03-20 00:40:44 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2022-03-20 00:40:44 +0000
commit: 4cbcc855382a06088e2f016f62cafdbcb7e40665 (patch)
tree: 356496503d52354aa6d9f2d36126302fed5f3a73 /sys-block
parent: fcc5224904648a8e6eb528d7603154160a20022f (diff)
34 files changed, 341 insertions, 380 deletions
diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz
index d784cd6d5a96..38da986f76a9 100644
--- a/sys-block/Manifest.gz
+++ b/sys-block/Manifest.gz
diff --git a/sys-block/arcconf/Manifest b/sys-block/arcconf/Manifest
index 7e91295b55bc..7e679764154c 100644
--- a/sys-block/arcconf/Manifest
+++ b/sys-block/arcconf/Manifest
@@ -1,5 +1,5 @@
 DIST arcconf_v2_01_22270.zip 47168976 BLAKE2B 95693a1408e5a4d0d638bbf265f2e1e64247dfec2b1078b56860c5fcd4b13ffa5967bfb9967abfd4b79c788aaeb20759b3a9070a84b083c1653e4868a96ac4cf SHA512 0f91a697c44ea0c0561bec9e432e7d4eba8eb8a2b0255a9867bdb183f81e745aee1dcc2b0017847803dbb27f55cad3e985f4bcd3a202c52f5b557fb724e94d9e
 DIST arcconf_v3_07_23971.zip 99777386 BLAKE2B 2fa5e5af1148d1aa67281af927cc9e158f85ffadcd49158adcd9dbb36b1a2c7b7607e68f44b5d2dc1e0ca80d7a0d64c447b93cffa048a03438a4473fefdc06e6 SHA512 09fc72931471c146ad6d5261efe15e2ede24198a16e554cc916bc30e775f592bd9ee476aaacace4df51504580aba03c52b30f5ebb133b410bddec3ccb330fddb
-EBUILD arcconf-2.01.22270-r1.ebuild 976 BLAKE2B 32a256f22700c1942507efc92a5952db4bc48e155a9e4e1d0cb8257c1e6ed3f382d0e6266f47d7d798f95c6e7a40cc1ec0b59efd3e0b4ae051a3df84202954c2 SHA512 495ba77e23fe276ab404643559194c71f29e891afab5613da69ecec857d741a21d0410e2a48044fb39da7b5bbb0e2f912c21002d993578aebef9e7b39bf43f8f
-EBUILD arcconf-3.07.23971.ebuild 831 BLAKE2B 82016cace110d362f80321403729a5e5fd8023974aa4266b1be8b60a2e24afec851ecc8e931c2d5eae842dd9cd96acff0b81f75925f9051393d13956b07c6132 SHA512 4a30e239b8e55ebb5080b11ca1b438ea001e12c440c14fcc62f8fd13850d64145c5658f47f8feb3f88c999dea071cf98be84f6088d11fbbbfa14328a0ab27828
+EBUILD arcconf-2.01.22270-r2.ebuild 975 BLAKE2B e2f313e3c7721bca366a9674e722da307f4206a28b32c04d671cc99b06d7ffb942046c05a4cd93636fb1cda6eae09c87c7753797bde6e8d76b422f44ae9371bc SHA512 7a9912a80d62e5456e60c6627ac49f67dd95ea67a9b1c54dd1568e669eb9e7c81d6f548dec7cec2915e205cdcc17bbe6fde3c2e14f6953b5993bf89d28fed56a
+EBUILD arcconf-3.07.23971-r1.ebuild 831 BLAKE2B 1d408645eaef3f66a7262721f2239a2259fe0a9ecef7035b7625ea70357ab1e1da2df05704f3b66f00b1e7d997bd6a8b7af380cc2c5e714ec20191d3b7b9b655 SHA512 7f7bd0c44c35acf773b6c3b8d8c0f0f5b99b34e811d1d78c7a5bd5ad9fbf5b0a8e44041fc6b60c60e754c37bd29f7f3432acb993da177fe12c851d932f399873
 MISC metadata.xml 820 BLAKE2B 09a6ab9403b4fc8b3687e6c8e11e5c9326e669427fe66d242897f6d8f8419e5f539b1b8c504c063bd93f35c5eca5da0de0ce118418ef3c42891cdb48d3f61937 SHA512 3e8e83d3949897c4b943affe5fbbf646990f28d9861fd8b6b9a5b276b71494baf552efd99a385f434c76d0f68f7e00cfb9a03951330ff6aa171299a30cf736d4
diff --git a/sys-block/arcconf/arcconf-2.01.22270-r1.ebuild b/sys-block/arcconf/arcconf-2.01.22270-r2.ebuild
index 10b55f1713e0..2b27f5c9eed9 100644
--- a/sys-block/arcconf/arcconf-2.01.22270-r1.ebuild
+++ b/sys-block/arcconf/arcconf-2.01.22270-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 MY_PV="v${PV//./_}"
 
@@ -10,6 +10,7 @@ inherit linux-info
 DESCRIPTION="Microsemi Adaptec RAID Controller Command Line Utility"
 HOMEPAGE="https://www.microsemi.com/"
 SRC_URI="http://download.adaptec.com/raid/storage_manager/${PN}_${MY_PV}.zip"
+S="${WORKDIR}"
 
 LICENSE="Microsemi"
 SLOT="0"
@@ -19,8 +20,6 @@ BDEPEND="app-arch/unzip"
 
 RESTRICT="fetch mirror bindist"
 
-S="${WORKDIR}"
-
 QA_PREBUILT="usr/bin/arcconf"
 
 pkg_nofetch() {
diff --git a/sys-block/arcconf/arcconf-3.07.23971.ebuild b/sys-block/arcconf/arcconf-3.07.23971-r1.ebuild
index 7d1a6ad982b0..1355deb39497 100644
--- a/sys-block/arcconf/arcconf-3.07.23971.ebuild
+++ b/sys-block/arcconf/arcconf-3.07.23971-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 MY_PV="v${PV//./_}"
 
diff --git a/sys-block/bmap-tools/Manifest b/sys-block/bmap-tools/Manifest
new file mode 100644
index 000000000000..12cfc12e1ca1
--- /dev/null
+++ b/sys-block/bmap-tools/Manifest
@@ -0,0 +1,3 @@
+DIST bmap-tools-3.6.tar.gz 97815 BLAKE2B 3c6728386d66283a4df0376c90d2eafc670bba835ca97ebe25ab12f5eb1f745dea9a55d8c287c815306b9d603b6d804f9711a19b2df23870355983ebce4c0a07 SHA512 a55fe88d8f136b39f2bb92690322ae65d66ae1ae0454050d74bd37a39d69dca6428ba05ff42d2faf8e83f8f8342d882caaf8bb45aa00c74bbd5e4b12289a406a
+EBUILD bmap-tools-3.6.ebuild 1195 BLAKE2B a6a6608e03ffa9eeffee3ad3fd27164191da67b5398761b4f0865a966b08b971e88d046a085a5274e3d2cab113839a2a3167e16c6d9873d42a95819ef05c7912 SHA512 5a21d618f105099b209a01b9cbba08f1470961ff15abb855c96a21b5f5e1209731ff3a8702d93ed1030dbbf2fd5932a47cc7b2527f9d90ff8dad3f57d5fec15e
+MISC metadata.xml 333 BLAKE2B 7d820818b65fc7613da7dabf60482e9352294892c7c6e8d7e8c9df91dc6d24edcaf42404b5d7f7f1d1f35cd338df6b395cc5c491d4f6eaa8cf375a270ae83436 SHA512 31b122594ac46064ce59088c934c7718a738bf1b15e29b1e196daf32ffce59cfdedaf1f9a16c0da30936d9c2954c22c882989bc3d002f80b13c4e0082fd42677
diff --git a/sys-block/bmap-tools/bmap-tools-3.6.ebuild b/sys-block/bmap-tools/bmap-tools-3.6.ebuild
new file mode 100644
index 000000000000..51a7426eaeea
--- /dev/null
+++ b/sys-block/bmap-tools/bmap-tools-3.6.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Flashing tool using block maps and sparse files"
+HOMEPAGE="https://github.com/intel/bmap-tools"
+
+if [[ ${PV} = 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/intel/bmap-tools.git"
+	EGIT_BRANCH="master"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/intel/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="test"
+
+BDEPEND="${PYTHON_DEPS}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}] )
+"
+
+RDEPEND="
+	app-arch/pigz
+	app-arch/lzop
+	app-arch/lz4
+	app-arch/pbzip2
+	app-arch/xz-utils
+	app-arch/bzip2
+	app-arch/gzip
+	app-arch/tar
+"
+
+DOCS=( "${S}/docs/README" )
+
+# tests are hanging using default below
+RESTRICT="!test? ( test )"
+
+distutils_enable_tests nose
+
+python_test() {
+	# remaining tests involve way too much file I/O
+	nosetests -sx --verbosity=3 --detailed-errors \
+		tests/test_bmap_helpers.py \
+		tests/test_compat.py || die "Tests fail with ${EPYTHON}"
+}
diff --git a/sys-block/bmap-tools/metadata.xml b/sys-block/bmap-tools/metadata.xml
new file mode 100644
index 000000000000..0c665a5d9e09
--- /dev/null
+++ b/sys-block/bmap-tools/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>embedded@gentoo.org</email>
+		<name>Embedded Gentoo</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">intel/bmap-tools</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/sys-block/fio/Manifest b/sys-block/fio/Manifest
index 88211007f5d5..0b65159c114c 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 4206 BLAKE2B 8800d344031e168b904e5fff61eb8a14a0ee92a44124f978e951ff38f5e3f388a6979d6303c9cf192bc9df7720a87af9bdb1cc5348b085f73524cd323f2cb964 SHA512 7415d1103be57a3af7ffc3c6608fe0a21d311218a70d3c381e293be592f68c2a213f928fea77b010894765e230bb2976e1fec008628912e0e31b3790db864f0e
-EBUILD fio-3.27-r3.ebuild 4307 BLAKE2B 26135cdc7985a68db5fda31c0de2617a42ccfa8b3f3b9624e05ba6edc1775d453df551c20b408787643f51b8dfb4fef0ef0593c9fd359f168ab32fb1996e3a93 SHA512 fc3248188e6eae72954bdb62137db9cc4305ff5886330e9a149cfd2f6342e55a5aefb1de8a31ecfee7c7e0f097a069f502532ba872806d8607801055acd0061f
-MISC metadata.xml 1173 BLAKE2B 757810c745c3639947d27c0d954ea2e46e00382d4293cff8f1e42f9d81f6d4a2ea8dc1b6570081fdf5c4f57f160bd880c894cfa6445e86d72b052cb282333d75 SHA512 8235e15b183df0f196ed038e74b6407805fd99114e34a792fee4521523b6f339fd932bdf3856b434b3a4a2bcef34da9eee43a83c3ebdf04c06e50c76fdd6d0a3
+EBUILD fio-3.27-r2.ebuild 4207 BLAKE2B 6d0a7738642f004b87cbc5e47235953da92954ad83cd54d8c690bd942e66bf1eb26460ec10bf1ed68794bfbaf1bbbe6e754da52e129e77937285a69ae7543dae SHA512 967aa4f80431e1ee20f480214e2c2fd39e8f3a40fc4ce93095ef98d4c815c6c7ec486db6ff7ae64e0c8d267ad473a809a02dac42b3ef58c0d1d8c35281294e98
+EBUILD fio-3.27-r3.ebuild 4308 BLAKE2B 2a9cf3883b0305ab818515343d85921cb7d57a698e1a731c02641509d33a713250633567623680558e38f01ece56f851c3f22fa310658e99c2334af8dc9a1783 SHA512 d0a5ef4a607e128d37ed4c9928b31d0d722fb1b45afd69199b2b75e23678cc719720e7b9dd404db493343466d792784504085177c352ca2958ffb38ae34009f6
+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 1e9e3cce92bf..afa61e798464 100644
--- a/sys-block/fio/fio-3.27-r2.ebuild
+++ b/sys-block/fio/fio-3.27-r2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://brick.kernel.dk/snaps/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~ia64 ppc ppc64 x86"
+KEYWORDS="amd64 arm ~arm64 ~ia64 ~ppc ppc64 x86"
 IUSE="aio curl glusterfs gnuplot gtk io-uring numa python rbd rdma static tcmalloc test zbc zlib"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
 	gnuplot? ( python )
diff --git a/sys-block/fio/fio-3.27-r3.ebuild b/sys-block/fio/fio-3.27-r3.ebuild
index 7165d4e4ba9c..ee7e62db9305 100644
--- a/sys-block/fio/fio-3.27-r3.ebuild
+++ b/sys-block/fio/fio-3.27-r3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://brick.kernel.dk/snaps/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~ia64 ppc ppc64 x86"
+KEYWORDS="amd64 arm ~arm64 ~ia64 ~ppc ppc64 x86"
 IUSE="aio curl glusterfs gnuplot gtk io-uring numa python rbd rdma static tcmalloc test zbc zlib"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
 	gnuplot? ( python )
diff --git a/sys-block/fio/metadata.xml b/sys-block/fio/metadata.xml
index 113e89aa3060..83445573eea0 100644
--- a/sys-block/fio/metadata.xml
+++ b/sys-block/fio/metadata.xml
@@ -15,7 +15,7 @@
 		<flag name="io-uring">Enable efficient I/O via <pkg>sys-libs/liburing</pkg>.</flag>
 		<flag name="numa">Enable numa support</flag>
 		<flag name="rbd">Enable Rados block device support via <pkg>sys-cluster/ceph</pkg></flag>
-		<flag name="rdma">Enable infiniband support via <pkg>sys-fabric/librdmacm</pkg></flag>
+		<flag name="rdma">Enable infiniband support via <pkg>sys-cluster/rdma-core</pkg></flag>
 		<flag name="tcmalloc">Link against <pkg>dev-util/google-perftools</pkg> by default which will speed up USE=rbd up to 20%</flag>
 		<flag name="zbc">Enable ZBC &amp; ZAC disks via <pkg>sys-block/libzbc</pkg>.</flag>
 	</use>
diff --git a/sys-block/megarc/Manifest b/sys-block/megarc/Manifest
index af49c055f641..00d3fd1fb8ac 100644
--- a/sys-block/megarc/Manifest
+++ b/sys-block/megarc/Manifest
@@ -1,4 +1,4 @@
 DIST README_FOR_ut_linux_megarc_1-11-zip.txt 3512 BLAKE2B acaf7d5213b1c13d46a8cca23f5f4ad87d8fa27bf64f61bd57916ff1e0addb0593f53b654a3383e2cb8342c2332b8e55cd5ead5830d157de52b36abef1be1167 SHA512 8ee63fad41875442e158b72a82fafe1ed15e00fd47bed2ff1f4f37f4bd6685eccfcd361294a2694a23c4d53d024d9488d5272ba5352685f346b7722ae7cff694
 DIST ut_linux_megarc_1-11.zip 301703 BLAKE2B e6092fe3e6a58b1d88701801121f2e77b324d3420aa55c824c600917387275f015677c470b7b9e1639777bfed40141e3cb7f5d88f6b08559d2243cb1b657f187 SHA512 9f79ad0c0bb05b9fd9044d66551da0ac95485ddd8ed3a37f1bdb064db80c97897f904150418e93b66783e86bc3ccb2ec1eca9bac7a5dd25bb03cd4414b8389b7
-EBUILD megarc-1.11-r2.ebuild 1761 BLAKE2B ada506e4bf8fdc5569fd88533736d19373103f3da3d4bef2ac570707e9f75ec1a240cfd6b011f01f476adc8a02bb089a85e2344d4f0e57b28c3072d82157648b SHA512 aa32d600a0cf5f8aaa0489eb6bdbd33a34672c130ca00826bc8f45611a4bfc6076e0e9ecb65bfcc7681cf6b46d5178a80d5c0ba13660c573b216d3e9973d7a08
+EBUILD megarc-1.11-r3.ebuild 1843 BLAKE2B 9d4d40b0998b53bfda47b1ea3ce1f177407f74ea2c6212daab0d4aa926774c0dc36e0a38ad83071c2bd103e8a8bcececb7ca8da3b5e6a59b8d7144c95cb8dcde SHA512 bd9c77bfa9f92952571b99f00da92bbc28aad441e7b91c5391b559367ddc1adf95cd32e4de7ab814248350df35a3a13c620af71269e245c53e36de4e0f88645e
 MISC metadata.xml 319 BLAKE2B 5a45f58f8cc5f61094270415357ea4a684040c69f261e9bc3bc07ef5cf8252e5c1201aac2317c2a14571185e7964fcd706533b15022820d14cb653c8aef1cc14 SHA512 c8e3764dd6248eebe247218e5a53136627fb3117f620ee336d6555f7c6b5fd62fc2eeb287d63120e50efa14496db647363ae3f2047efcfcca7cfde6e7a8fe6aa
diff --git a/sys-block/megarc/megarc-1.11-r2.ebuild b/sys-block/megarc/megarc-1.11-r3.ebuild
index 86004d9903f9..096122d4a4f7 100644
--- a/sys-block/megarc/megarc-1.11-r2.ebuild
+++ b/sys-block/megarc/megarc-1.11-r3.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="8"
 
 inherit multilib
 
@@ -15,10 +15,11 @@ DESCRIPTION="LSI Logic MegaRAID Text User Interface management tool"
 # two or more download pages, and while one of the pages has a generic
 # click-through download form, the file-specific download page only requires
 # click-through on some items. See also sys-block/lsiutil, sys-block/megarc
+# 2022/03/19: robbat2 confirms the SRC_URI links work AND the files have not changed upstream
 HOMEPAGE="http://www.avagotech.com/cs/Satellite?q=megacli&pagename=AVG2%2FsearchLayout&locale=avg_en&within=megacli&Search=megarc&srch-radio=new&Submit=Search"
 SRC_URI="
-	http://www.avagotech.com/docs-and-downloads/legacy-raid-controllers/legacy-raid-controllers-common-files/${MY_P}.zip
-	http://www.avagotech.com/docs-and-downloads/raid-controllers/raid-controllers-common-files/README_FOR_${MY_P}-zip.txt"
+	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"
 
 LICENSE="LSI"
 SLOT="0"
diff --git a/sys-block/parted/Manifest b/sys-block/parted/Manifest
index 282563b9a6c2..5967d1809887 100644
--- a/sys-block/parted/Manifest
+++ b/sys-block/parted/Manifest
@@ -1,6 +1,7 @@
 AUX parted-3.2-po4a-mandir.patch 275 BLAKE2B 5342cc776f557c9ef95604eb2c15ad484c4dbf102d4093dcb1d4005f2f6d4f90db2ff0fc3ceae59fd22c3442604b2abbdac48594f860ba810dc4d8dce89d6fc0 SHA512 5ef686f56d8c3939da3f24fdb6196d8858c2f980805f1cb06020d6f6996158f62b8372a233ec3ec98aae30b41034046d615e415b3abf2648db7be88e3b45a872
 AUX parted-3.3-atari.patch 421 BLAKE2B 9048176f882e66cf89cc2d79aa0ea7a550f9c649d8f54f4df102eb361c6e0be473a2e07e1ab8f63dc446422a92ced10cfb4858a27b7988c1b5a960e6e8e1d518 SHA512 59738de6f89dd6d407eef139ffe4d0925d418f4d33a30a1ead1e1f05ab7ad93e13294412d5061dd40302b9592a33b97f137089f477dc6a2febd3fe60eae77ca0
+AUX parted-3.4-posix-printf.patch 2872 BLAKE2B 55c1bef638a88f7d3b5b1f90ca28df1d0ccb40590536c0a0f10416509c3d90a2a329dd530ebbcc9945b2eefb7a3540a113d27a73c7d636b372eb9fc8e19f7eed SHA512 d16bb7e3cfccaa8b40ece90b507559857fb1a4f5a08bc93da61b7afde4b69e06de363948426cec66cbb1135d6d1d5a50206cee6cec9973e1cb02aefe50697670
 DIST parted-3.4.tar.xz 1860300 BLAKE2B c724d3d1490c62d440b9e5dc359fef7ff623bc77ae5f867d8905245cb279ec391fa07a1a774488ad3bf7a2c477007264d7bab2635a544be8f94dc706a654a711 SHA512 e69bd1b610778e980d4595d04892f2ea1faf4ae9bfc98cd62abfc70066423f08ddaa396f9461c7beb1330d023232274606b6b26091a0458aeedd0f3f57536690
 DIST parted-3.4.tar.xz.sig 508 BLAKE2B 112ad0158b1100bd9150a7c87e8f93e67d42870b82a17d4d0aa8bb5e46306f837f3f99feabaf301f8cd640c299174e5f5acf152dd1f20ea2b7ace73d57d31f14 SHA512 6b11812267e66470ba2908ee1cc78b232b0bc2519787f5a17b92cd5f8ba904b1a836833f19c5244b23d4c7810437eeb26fbbd68fac819391b342709682345472
-EBUILD parted-3.4.ebuild 1419 BLAKE2B 40b01ca5bc5c56ccbd557e93eed1e194118e8fb26c9bb85a08b473e593ebb87a21047a459dafd4084b208c617c2c9857b2a6f762ac2bdeb71bee911580b81ecd SHA512 a4bc047cf7a78124d5bfc443a13e6c13d6ca521630125fb7d4715557f52911d44049d876ca05203f7e056a043da0452e3ca9a392fc17fc7e77552199b3ffb466
+EBUILD parted-3.4.ebuild 1529 BLAKE2B bcf56fbeb5c6fffa1c591e1fac4ee20e08e12746d696cfec201f8db7573104260b72d9926863ee09871c78d70746f18c5a37a39be584fde2b033c360ba950ed6 SHA512 2ca888cc646023fa8eb65ab154cc0213793956e510226cbbc27888c18e9a77b7b5c0283bfb7079ef92abbb5936ebbc1f9b702564cf5b8db799d57ad03710e1ca
 MISC metadata.xml 887 BLAKE2B 04b4f255209a5d1c26fe4d84eb6a2d0fe7b87ff30fb2cb0425685c277eecbc498a7886ec328fdf2456bc02af4d787cd7eed16e2a9a02c5b8ef8f146d3c551d77 SHA512 6cacc6560766381699e0c46241a9446260e984a78eb9c8d39486e699d4880e2ae712b199b628a3fcdfe9cd98cfe18b47198675e8546cf84d89fbe464e2ab1997
diff --git a/sys-block/parted/files/parted-3.4-posix-printf.patch b/sys-block/parted/files/parted-3.4-posix-printf.patch
new file mode 100644
index 000000000000..9aeb37c2cf27
--- /dev/null
+++ b/sys-block/parted/files/parted-3.4-posix-printf.patch
@@ -0,0 +1,63 @@
+From 9665bdd5d6756058bb3b767eacc1c195667bf276 Mon Sep 17 00:00:00 2001
+From: Kerin Millar <kfm@plushkava.net>
+Date: Sat, 5 Feb 2022 03:29:34 +0000
+Subject: [PATCH] tests: have printf(1) use octal numbers for POSIX conformance
+
+Per https://pubs.opengroup.org/onlinepubs/9699919799/utilities/printf.html,
+backslash-escape sequences incorporating hexadecimal numbers are non-standard.
+
+Signed-off-by: Kerin Millar <kfm@plushkava.net>
+---
+ tests/t0205-gpt-list-clobbers-pmbr.sh                       | 4 ++--
+ tests/t0206-gpt-print-with-corrupt-primary-clobbers-pmbr.sh | 4 ++--
+ tests/t2500-probe-corrupt-hfs.sh                            | 4 ++--
+ 3 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/tests/t0205-gpt-list-clobbers-pmbr.sh b/tests/t0205-gpt-list-clobbers-pmbr.sh
+index 52f60cc..b1664fb 100644
+--- a/tests/t0205-gpt-list-clobbers-pmbr.sh
++++ b/tests/t0205-gpt-list-clobbers-pmbr.sh
+@@ -36,8 +36,8 @@ parted -m -s $dev u s p                        || fail=1
+ 
+ # Write non-NUL bytes all over the MBR, so we're likely to see any change.
+ # However, be careful to leave the type of the first partition, 0xEE,
+-# as well as the final two magic bytes.
+-printf '%0450d\xee%059d\x55\xaa' 0 0 | dd of=$dev count=1 conv=notrunc || fail=1
++# as well as the final two magic bytes, 0x55 0xAA.
++printf '%0450d\356%059d\125\252' 0 0 | dd of=$dev count=1 conv=notrunc || fail=1
+ 
+ dd if=$dev of=before count=1 || fail=1
+ 
+diff --git a/tests/t0206-gpt-print-with-corrupt-primary-clobbers-pmbr.sh b/tests/t0206-gpt-print-with-corrupt-primary-clobbers-pmbr.sh
+index 83c2a9c..8f2a4ef 100755
+--- a/tests/t0206-gpt-print-with-corrupt-primary-clobbers-pmbr.sh
++++ b/tests/t0206-gpt-print-with-corrupt-primary-clobbers-pmbr.sh
+@@ -32,8 +32,8 @@ parted -m -s $dev u s p                        || fail=1
+ 
+ # Write non-NUL bytes all over the MBR, so we're likely to see any change.
+ # However, be careful to leave the type of the first partition, 0xEE,
+-# as well as the final two magic bytes.
+-printf '%0450d\xee%059d\x55\xaa' 0 0 | dd of=$dev count=1 conv=notrunc || fail=1
++# as well as the final two magic bytes, 0x55 0xAA.
++printf '%0450d\356%059d\125\252' 0 0 | dd of=$dev count=1 conv=notrunc || fail=1
+ 
+ dd if=$dev of=before count=1 || fail=1
+ 
+diff --git a/tests/t2500-probe-corrupt-hfs.sh b/tests/t2500-probe-corrupt-hfs.sh
+index 3b4ade8..32ddcfc 100755
+--- a/tests/t2500-probe-corrupt-hfs.sh
++++ b/tests/t2500-probe-corrupt-hfs.sh
+@@ -29,8 +29,8 @@ compare /dev/null out || fail=1
+ 
+ parted -s "$dev" u s p || fail=1
+ 
+-# Poke an HFS+ signature into place
+-printf '\x48\x2b' | dd of=$dev seek=$((2048+2)) conv=notrunc || fail=1
++# Poke an HFS+ signature into place (0x48 0x2B)
++printf '\110\053' | dd of=$dev seek=$((2048+2)) conv=notrunc || fail=1
+ 
+ # Or, if starting from a valid HFS/HFS+ file system, poke these:
+ # offset 18 total_blocks=0(16b)
+-- 
+2.35.1
+
diff --git a/sys-block/parted/parted-3.4.ebuild b/sys-block/parted/parted-3.4.ebuild
index 67d60f004ca8..338886d0c62d 100644
--- a/sys-block/parted/parted-3.4.ebuild
+++ b/sys-block/parted/parted-3.4.ebuild
@@ -37,6 +37,8 @@ VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/bcl.asc
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.2-po4a-mandir.patch
 	"${FILESDIR}"/${PN}-3.3-atari.patch
+	# https://lists.gnu.org/archive/html/bug-parted/2022-02/msg00000.html
+	"${FILESDIR}"/${P}-posix-printf.patch
 )
 
 src_prepare() {
diff --git a/sys-block/partitionmanager/Manifest b/sys-block/partitionmanager/Manifest
index 58eec0da0a17..2d427bb84ae4 100644
--- a/sys-block/partitionmanager/Manifest
+++ b/sys-block/partitionmanager/Manifest
@@ -1,5 +1,5 @@
 DIST partitionmanager-21.08.3.tar.xz 2098484 BLAKE2B b430f94875d4139e76358c63f945d95ead216e4179396fd2a2f83ac38975c312137d583376fd1d417bc34c4b437d0c99b1cc5af75e046de33a66bb10e5c45953 SHA512 79d5465ba7635a80e5afd4d1240c5dbeb5469003e8b8f0731bd3a88a8fa0ff3ee8a2d01b02ef661732f4bd89c06e9f461c726435e8dc60155338f1b44fee49c1
-DIST partitionmanager-21.12.1.tar.xz 2098476 BLAKE2B 2b3c4dc3e7b60a36f7b1cdb9460af63a072d5a3b30775225e752e4f47e34681502bdbe245f7f6e418b754caf7720ad92c1df9c892d6b9a3aa47a83caace09979 SHA512 8aeee53dc58fcba2396ad148956b588af7a11c6ebe75063ece30bc8752967d04c6fb08cbd3a3b84a965fcdf88e241198b390b43550604f645bff4c32de8dfee7
+DIST partitionmanager-21.12.3.tar.xz 2098684 BLAKE2B 3a6301a1bdd3187853528e0e43d5f22576acf3386bacaaf48386f7db2c9f4de2ff657f4b08a46acc67a9aeb686be411af1f25f693a3326e955093199cd255ca0 SHA512 3d85b323b8c00f17b3dfe7de3b4654e21c5ebb9d166aa9ef7929e12533a5568bfe92bcddc746c639852103df3b6a4bec975813867857d6f0bff3aef35d8665f3
 EBUILD partitionmanager-21.08.3.ebuild 930 BLAKE2B ef01432ead0cf2d1e0f36d41e17bc8e5dc1783d7afc5c49354d728b3b6ad902da933ef5dfabca213101ab42846603c8fa580d261d07bd727120753e205a2a4c7 SHA512 b6f6def3b1c6a5435593b01f5b363d176b57a57482cf1c4558aa99e4e9da81e80a7494ecf2a71216ebd1ff2007eb4691ef78267047fd70abc4240bcff3cb425c
-EBUILD partitionmanager-21.12.1.ebuild 933 BLAKE2B dba7e4bad9628698b1246a0f89603fe328c2408ef5724d55396a31af4465b5c94d78f8a3d84ccadebe94634159c6ebad6eaafdf12482d644c75697ca2f53d1da SHA512 f41751da7bfece09700a69383bd28435c5d3287ba0039cb7b2189b1358b8f3b2d5863fbb28733a595082ff48648e7be7cf60ab16af064a36959173323c70288a
+EBUILD partitionmanager-21.12.3.ebuild 933 BLAKE2B dba7e4bad9628698b1246a0f89603fe328c2408ef5724d55396a31af4465b5c94d78f8a3d84ccadebe94634159c6ebad6eaafdf12482d644c75697ca2f53d1da SHA512 f41751da7bfece09700a69383bd28435c5d3287ba0039cb7b2189b1358b8f3b2d5863fbb28733a595082ff48648e7be7cf60ab16af064a36959173323c70288a
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/sys-block/partitionmanager/partitionmanager-21.12.1.ebuild b/sys-block/partitionmanager/partitionmanager-21.12.3.ebuild
index 913a64a70c96..913a64a70c96 100644
--- a/sys-block/partitionmanager/partitionmanager-21.12.1.ebuild
+++ b/sys-block/partitionmanager/partitionmanager-21.12.3.ebuild
diff --git a/sys-block/scsirastools/Manifest b/sys-block/scsirastools/Manifest
index f06577da02ac..67f83d15606f 100644
--- a/sys-block/scsirastools/Manifest
+++ b/sys-block/scsirastools/Manifest
@@ -1,7 +1,5 @@
-AUX scsirastools-1.5.6-glibc-2.10.patch 3881 BLAKE2B b7d299574f359a9066ad01dc9d09a3d096df41e416253eb2202e02d5f556ba50561a14d04b0ef4833a3beaabf5b3a5260e600f6aa39885727e9e7fab97c5f836 SHA512 6c09b07e53b9c536338123ba3f6814ca225880c8f5f3e7aac2de7d11212bcc2f8918ef40705dbc1d419bdb28c941a688aab41ae469be1e6f50939f7277b590a8
-AUX scsirastools-1.5.7-sysmacros.patch 634 BLAKE2B 5ce1302984c649b5a378bf8af1be1223c606234d337f2c979564d288948029db69b0fea49dc746d58fe26a9ae4f6e14c0c3044c5c8121e816cac012bde31e4b3 SHA512 2339c57d3b50b80bdc17a1177403a109e7d377ecf4231c63e88a34abed5c9cc0336b5495e972077c6a4c32cf517e0c15bd7bf1982204ea1a89e25b4d03d0eac4
-DIST scsirastools-1.5.7.tar.gz 677348 BLAKE2B f94134fc9e4c17d794a77e42143d620fb8096e2cc64e66fa290563921fa625a322f823ba9f88c17547eb5f03e0a6caf14e106e9d0499afd301e6961fead0345c SHA512 399d366216b5f24ef67086b2e5713a259435293219e22166530a6b92a45519b677bd980906691d2166f1fa6b6ee873568b143df32cfed6a5500066ea914b12f2
-DIST scsirastools-1.6.4.tar.gz 659203 BLAKE2B d041d64662d13165baa1f182e765334ff9027325c90ae92557a48d1edbcba8e96376f0bd5fa1a9952557c74f1c0acad52aff415207c114df44459f1ad99f9da2 SHA512 a0331557eb9c535b3bf33a95994d957505873bc1b39ee240846161a79d7e1f7ed494b23678e23931e917014cf7ebb6a0dd81e5f62089db06e03cf138db06a0fa
-EBUILD scsirastools-1.5.7-r1.ebuild 1377 BLAKE2B e46570da59a9e5b235322884f7629ee88480db81111d24542b71c1899bdfdb5013699dc0d8742e4f03730cab803f87a06cc7fd785bbfdeb082b452ec85df114a SHA512 4f0d8451e645a8c8e6d3bc745a7b57bce67ed90c6878ef7f7da727f7ba46abb94d82a1427737023e12fcfa498fe48323c9b170ffb8df9b93a11c87306dda0ff1
-EBUILD scsirastools-1.6.4-r1.ebuild 1296 BLAKE2B f6cf494b286b853989854c1e701d95d96d69df4d8ae8b09e8c9fb88900a12fd0d68868fa76cef827c98cfc696c9bfbec1d6bda717675d056aec3baa37d58f7f8 SHA512 5568b8f55c2eeccce1268dc5cd390cf645e082a7ad1993e8b7a2f1fbbe3864cfb55d36a8ebcd56a80bee9ac1a53247547cc68bb25978c10dedc49580ce5cbcf0
+AUX scsirastools-1.6.6-autotools.patch 2032 BLAKE2B 54db25b493dd8ba508253c8114ab5745587639c610c62dcc3d8bd25b2fb04fd4a6b93af81de91109dbcf4e1bd81db77eecd76b80ed0d7196fb04b01f453193ad SHA512 cee78b2c743d2fc395a3afc60acf3345e0c2bf2dbc5536e50714ac9da5453d28b7b690aebcf0dde3464aecf7b0764ac91743f55ab68e7bf91589700ac66093b5
+AUX scsirastools-1.6.6-prefix.patch 1034 BLAKE2B c6d4d697078d60239e6418fb9dc8abe1bc4e741a414a3513daed0dff12c67be841bc4d74d1813cf8e5e779b286016ab6406cefb4f5f1499e507f7f443a3c5133 SHA512 0bec8e3e01d5a9172ecf643b3d1a05339c206f723769528922fbeab9bb6041d859b4a41e16269d98aa544720275b9cd0c967c55963fbe1c311799fe8dfc1dcfb
+DIST scsirastools-1.6.6.tar.gz 813890 BLAKE2B 62ccbc2462e9d4d3ce3aba2a0c0c70b8634e41b8230415b0137674079fc2e73ea5006215ef7aa66f912170f1c485c5a03c3e365f280e8e173562f29a7952f56a SHA512 a679e41e0984e3aa21be57129329bd40a08a436c256645b4f8b00250f3f8f0c9d3cf15540f5f75a21d1b7b3826a0fc2830ad5f3ade54a6e703fc8ffbcc01d886
+EBUILD scsirastools-1.6.6.ebuild 755 BLAKE2B a91961c58033caa510a279089d2fa237b8656f67222cdc51508642257337ed953a81f17b89fa9975bb0aa74797f52b46f79a30a655dfcb0f1a1d04b4d4e2b705 SHA512 c4bb3c8277a55691fcc040a4cda461766151dad872c2bde86146810b2370f68ac3425a7eb14e14bd6c7279c087bde92424ac2dab703ca871a8054aca031e53fb
 MISC metadata.xml 309 BLAKE2B 912f505a7d9e1296436364dc01b25b54aa7ce4efa9c62b6672b5cb7aa5acd18002c949601ac13dcb2155dd516b02d327ffbf9e2ef8ae5f1281abdc9221c448b8 SHA512 9d400f534fa072c8582966ea499773d00cd86b63350df719721dc50dcae429900dbdc1d217149aa91cb79bdd812193e9589a6e806f9a65394e05a40cca660cbc
diff --git a/sys-block/scsirastools/files/scsirastools-1.5.6-glibc-2.10.patch b/sys-block/scsirastools/files/scsirastools-1.5.6-glibc-2.10.patch
deleted file mode 100644
index de874bad2911..000000000000
--- a/sys-block/scsirastools/files/scsirastools-1.5.6-glibc-2.10.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-diff -ur scsirastools-1.5.6.orig/src/getmd.c scsirastools-1.5.6/src/getmd.c
---- scsirastools-1.5.6.orig/src/getmd.c	2007-02-02 21:16:38.000000000 +0200
-+++ scsirastools-1.5.6/src/getmd.c	2009-08-05 22:51:00.000000000 +0300
-@@ -81,7 +81,7 @@
-     } else return (-1);  /*not found*/
- }
- 
--static int getline(FILE * fd, char *buf, int len)
-+static int get_line(FILE * fd, char *buf, int len)
- {
-     int i;
-     int ch;
-@@ -119,7 +119,7 @@
-     sraidstr = strlen(raidstr);
-     strcpy(mdpart, "/dev/sda1");	/* default */
-     strcpy(rdev, "/dev/md0");	/* default */
--    while ((rlen = getline(fd, buf, 80)) > 0) {	/* process each line */
-+    while ((rlen = get_line(fd, buf, 80)) > 0) {	/* process each line */
- 	buf[rlen] = 0;		/* stringify */
- 	/* look for raiddev string */
- 	i = findmatch(buf, rlen, raidstr, sraidstr, 0);
-diff -ur scsirastools-1.5.6.orig/src/sgraidmon.c scsirastools-1.5.6/src/sgraidmon.c
---- scsirastools-1.5.6.orig/src/sgraidmon.c	2007-10-16 01:15:15.000000000 +0300
-+++ scsirastools-1.5.6/src/sgraidmon.c	2009-08-05 22:51:00.000000000 +0300
-@@ -330,7 +330,7 @@
-     rdev[0] = 0;	/* default rdev (mddev) */
-     strcpy(mdpart, "/dev/sdz1");	/* default mdpart */
-     foundit = 0;
--    while ((rlen = getline(fd, buf, 80)) > 0) {	/* process each line */
-+    while ((rlen = get_line(fd, buf, 80)) > 0) {	/* process each line */
- 	buf[rlen] = 0;		/* stringify */
- 	/* check for comment */
- 	if (buf[0] == '#') continue;
-@@ -392,7 +392,7 @@
-    if (fd == NULL) return (np);
-    sraidstr = strlen(raidstr);
-    sdevstr = strlen(devstr);
--   while ((rlen = getline(fd, buf, 80)) > 0) {	/* process each line */
-+   while ((rlen = get_line(fd, buf, 80)) > 0) {	/* process each line */
- 	buf[rlen] = 0;		/* stringify */
- 	/* check for comment */
- 	if (buf[0] == '#') continue;
-diff -ur scsirastools-1.5.6.orig/src/sgsafte.c scsirastools-1.5.6/src/sgsafte.c
---- scsirastools-1.5.6.orig/src/sgsafte.c	2007-09-13 00:45:29.000000000 +0300
-+++ scsirastools-1.5.6/src/sgsafte.c	2009-08-05 22:51:00.000000000 +0300
-@@ -231,7 +231,7 @@
-     rdev[0] = 0;	/* default rdev (mddev) */
-     strcpy(mdpart, "/dev/sdz1");	/* default mdpart */
-     foundit = 0;
--    while ((rlen = getline(fd, buf, 80)) > 0) {	/* process each line */
-+    while ((rlen = get_line(fd, buf, 80)) > 0) {	/* process each line */
- 	buf[rlen] = 0;		/* stringify */
- 	/* look for raiddev string */
- 	i = findmatch(buf, rlen, raidstr, sraidstr, 0);
-@@ -284,7 +284,7 @@
-    fd = fopen(raidfile, "r");
-    if (fd == NULL) return (np);
-    sraidstr = strlen(raidstr);
--   while ((rlen = getline(fd, buf, 80)) > 0) {	/* process each line */
-+   while ((rlen = get_line(fd, buf, 80)) > 0) {	/* process each line */
- 	buf[rlen] = 0;		/* stringify */
- 	/* look for raiddev string */
- 	i = findmatch(buf, rlen, raidstr, sraidstr, 0);
-diff -ur scsirastools-1.5.6.orig/src/sgsubmon.c scsirastools-1.5.6/src/sgsubmon.c
---- scsirastools-1.5.6.orig/src/sgsubmon.c	2007-10-16 17:03:39.000000000 +0300
-+++ scsirastools-1.5.6/src/sgsubmon.c	2009-08-05 22:51:00.000000000 +0300
-@@ -159,7 +159,7 @@
-    return;
- } 
- 
--int getline(FILE * fd, char *buf, int len)
-+int get_line(FILE * fd, char *buf, int len)
- {
-     int i;
-     int ch;
-diff -ur scsirastools-1.5.6.orig/src/sgsubmon.h scsirastools-1.5.6/src/sgsubmon.h
---- scsirastools-1.5.6.orig/src/sgsubmon.h	2007-09-13 00:38:28.000000000 +0300
-+++ scsirastools-1.5.6/src/sgsubmon.h	2009-08-05 22:50:59.000000000 +0300
-@@ -124,7 +124,7 @@
- void itoh(uchar * chp, int len, char *str);
- void dumpbufr(FILE * fdout, uchar * bufp, int mlen, char *hdr);
- void dump_buf(FILE * fdout, uchar * bufp, int mlen, char *hdr, char fascii);
--int  getline(FILE * fd, char *buf, int len) ;
-+int  get_line(FILE * fd, char *buf, int len) ;
- int  findmatch(char *buffer,int sbuf, char *pattern,int spattern,char figncase);
- int  fillstr(char *to, uchar *from,int len);
- int  IsSATA(int idev);
diff --git a/sys-block/scsirastools/files/scsirastools-1.5.7-sysmacros.patch b/sys-block/scsirastools/files/scsirastools-1.5.7-sysmacros.patch
deleted file mode 100644
index 76cef536de8f..000000000000
--- a/sys-block/scsirastools/files/scsirastools-1.5.7-sysmacros.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-https://bugs.gentoo.org/580214
-https://sourceforge.net/p/scsirastools/bugs/16/
-
---- a/src/sgcommon.c
-+++ b/src/sgcommon.c
-@@ -62,6 +62,7 @@
-   -------------------------------------------------------------------------*/
- #include <sys/types.h>
- #include <sys/stat.h>
-+#include <sys/sysmacros.h>
- #include <unistd.h>
- #include <stdio.h>
- #include <stdlib.h>
---- a/src/sgsubmon.c
-+++ b/src/sgsubmon.c
-@@ -34,6 +34,7 @@
-  *---------------------------------------------------------------------------*/
- #include <sys/types.h>
- #include <sys/stat.h>
-+#include <sys/sysmacros.h>
- #include <unistd.h>
- #include <stdio.h>
- #include <stdlib.h>
diff --git a/sys-block/scsirastools/files/scsirastools-1.6.6-autotools.patch b/sys-block/scsirastools/files/scsirastools-1.6.6-autotools.patch
new file mode 100644
index 000000000000..d4f6e222e112
--- /dev/null
+++ b/sys-block/scsirastools/files/scsirastools-1.6.6-autotools.patch
@@ -0,0 +1,71 @@
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -1,42 +1,2 @@
+-#!/bin/sh
+-# Makefile to build/install doc files
+-#
+-TOPDIR = ${top_srcdir}
+-fromd =	$(TOPDIR)/doc
+-MKDIR = sh $(TOPDIR)/mkinstalldirs 
+-INSTALL_SH = sh $(TOPDIR)/install-sh
+-INSTALL_DATA_CMD = ${INSTALL_SH} -c -m 644
+-INSTALL_SCRIPT_CMD =  ${INSTALL_SH} -c -m 755
+-prefix = /usr
+-exe_prefix = 
+-
+-datadir = ${prefix}/share
+-mandir = ${prefix}/share/man
+-sysconfdir = ${exe_prefix}/etc
+-sbindir = ${exe_prefix}/sbin
+-datato = ${DESTDIR}${datadir}/scsirastools
+-
+-sbin_PROGRAMS = 
+-	
+-all:
+-
+-clean:
+-
+-distclean:
+-
+-install:
+-	$(MKDIR) ${DESTDIR}${mandir}/man8
+-	$(MKDIR) ${datato}
+-	${INSTALL_DATA_CMD} $(fromd)/sgdefects.8   ${DESTDIR}${mandir}/man8
+-	${INSTALL_DATA_CMD} $(fromd)/sgdskfl.8     ${DESTDIR}${mandir}/man8
+-	${INSTALL_DATA_CMD} $(fromd)/sgdiag.8      ${DESTDIR}${mandir}/man8
+-	${INSTALL_DATA_CMD} $(fromd)/sgmode.8      ${DESTDIR}${mandir}/man8
+-	${INSTALL_DATA_CMD} $(fromd)/sgraidmon.8   ${DESTDIR}${mandir}/man8
+-	${INSTALL_DATA_CMD} $(fromd)/sgdiskmon.8   ${DESTDIR}${mandir}/man8
+-	${INSTALL_DATA_CMD} $(fromd)/sgsafte.8     ${DESTDIR}${mandir}/man8
+-	${INSTALL_DATA_CMD} $(fromd)/UserGuide     ${datato}
+-	${INSTALL_DATA_CMD} $(TOPDIR)/README       ${datato}
+-	${INSTALL_DATA_CMD} $(TOPDIR)/COPYING      ${datato}
+-	${INSTALL_DATA_CMD} $(TOPDIR)/kern/SCSIRAS ${datato}
+-	
+-EXTRA_DIST = 
++dist_man_MANS = sgdefects.8 sgdskfl.8 sgdiag.8 sgmode.8 sgraidmon.8 sgdiskmon.8 sgsafte.8
++dist_doc_DATA = UserGuide
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,20 +1,15 @@
+ 
+-SUBDIRS = mdadm.d src files doc 
++SUBDIRS = src doc
+ PKGDIR = /usr/src/redhat
+ SOURCEDIR = $(PKGDIR)/SOURCES
+ BUILDDIR = $(PKGDIR)/BUILD
+ RSPEC = doc/$(PACKAGE).spec
+ PNAME  = $(PACKAGE)-$(VERSION)
+ TMPDIR = /tmp/$(PNAME)
+-RPMB = rpmbuild
+ 
+ rpm:	$(RSPEC)
+ 	make tarball
+-	$(RPMB) -bs  $(RSPEC)
+-	$(RPMB) -bb  $(RSPEC)
+ 
+-# $(RPMB) --rebuild $(PKGDIR)/SRPMS/$(PNAME)-1.i386.rpm
+-# $(RPMB) -bb --buildroot $(BUILDDIR)/$(PNAME) $(RSPEC)
+ 
+ tarball:
+ 	rm -f $(SOURCEDIR)/$(PNAME).tar.gz 
diff --git a/sys-block/scsirastools/files/scsirastools-1.6.6-prefix.patch b/sys-block/scsirastools/files/scsirastools-1.6.6-prefix.patch
new file mode 100644
index 000000000000..5d52ec7db003
--- /dev/null
+++ b/sys-block/scsirastools/files/scsirastools-1.6.6-prefix.patch
@@ -0,0 +1,24 @@
+* binaries get installed into /usr/sbin
+
+--- a/src/sgdiskmon.c
++++ b/src/sgdiskmon.c
+@@ -80,7 +80,7 @@
+ //////////////////////////////////////////////////////////////////////
+ char *progver  = "1.66";         /* program version */
+ char *progname    = "sgdiskmon";   /* program name */
+-char sgevtcmd[]   = "/sbin/sgevt";
++char sgevtcmd[]   = "/usr/sbin/sgevt";
+ char initscript[] = "/etc/init.d/sgdisk";
+ char logfile[]    = "/var/log/sgdiskmon.log";     /* log filename */   
+ FILE *fdlog = NULL;             /* log file descriptor */
+--- a/src/sgraidmon.c
++++ b/src/sgraidmon.c
+@@ -152,7 +152,7 @@
+ //////////////////////////////////////////////////////////////////////
+ char *progver  = "1.66";        /* program version */
+ char *progname    = "sgraidmon";   /* program name */
+-char mdevtcmd[]   = "/sbin/mdevt";
++char mdevtcmd[]   = "/usr/sbin/mdevt";
+ char initscript[] = "/etc/init.d/sgraid";
+ char logfile[]    = "/var/log/sgraidmon.log";     /* log filename */   
+ FILE *fdlog = NULL;             /* log file descriptor */
diff --git a/sys-block/scsirastools/scsirastools-1.5.7-r1.ebuild b/sys-block/scsirastools/scsirastools-1.5.7-r1.ebuild
deleted file mode 100644
index 6fab3675a2ee..000000000000
--- a/sys-block/scsirastools/scsirastools-1.5.7-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit autotools epatch
-
-DESCRIPTION="Serviceability for SCSI Disks and Arrays"
-HOMEPAGE="http://scsirastools.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND=">=sys-apps/sg3_utils-1.44"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-sysmacros.patch #580214
-	# this builds a really old mdadm
-	sed -i \
-		-e '/RPMB/d' \
-		-e '/^SUBDIRS/s,mdadm.d,,' \
-		-e '/^SUBDIRS/s,files,,' \
-		Makefile.am || die "sed Makefile.am failed"
-	epatch "${FILESDIR}"/${PN}-1.5.6-glibc-2.10.patch
-	eautoreconf
-	# i386 ELF binaries in tarball = bad
-	rm -f "${S}"/files/alarms*
-
-	# Fix up /sbin instances to be /usr/sbin instead
-	for i in src/sgraidmon.c src/sgdiskmon.c ; do
-		sed -i "${S}"/${i} \
-			-e '/evtcmd\[\].*\"\/sbin\//s,/sbin/,/usr/sbin/,' \
-			|| die "Failed to set /sbin in sources"
-	done
-}
-
-src_configure() {
-	econf --sbindir=/usr/sbin
-}
-
-src_install() {
-	into /usr
-	docdir="/usr/share/doc/${PF}/"
-	emake install DESTDIR="${D}" datato="${D}${docdir}"
-	dosbin files/sgevt
-	dosbin files/mdevt
-	# unneeded files
-	rm -f "${D}"${docdir}/{SCSIRAS,COPYING}
-	# install modepage files
-	insinto /usr/share/${PN}
-	doins files/*.mdf
-	# new docs
-	dodoc ChangeLog AUTHORS TODO
-}
diff --git a/sys-block/scsirastools/scsirastools-1.6.4-r1.ebuild b/sys-block/scsirastools/scsirastools-1.6.4-r1.ebuild
deleted file mode 100644
index a0fd6aa0e5f1..000000000000
--- a/sys-block/scsirastools/scsirastools-1.6.4-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit autotools epatch
-
-DESCRIPTION="Serviceability for SCSI Disks and Arrays"
-HOMEPAGE="http://scsirastools.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND=">=sys-apps/sg3_utils-1.44"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.5.7-sysmacros.patch #580214
-	# this builds a really old mdadm
-	sed -i \
-		-e '/RPMB/d' \
-		-e '/^SUBDIRS/s,mdadm.d,,' \
-		-e '/^SUBDIRS/s,files,,' \
-		Makefile.am || die "sed Makefile.am failed"
-	eautoreconf
-	# i386 ELF binaries in tarball = bad
-	rm "${S}"/files/ialarms* || die
-
-	# Fix up /sbin instances to be /usr/sbin instead
-	for i in src/sgraidmon.c src/sgdiskmon.c ; do
-		sed -i "${S}"/${i} \
-			-e '/evtcmd\[\].*\"\/sbin\//s,/sbin/,/usr/sbin/,' \
-			|| die "Failed to set /sbin in sources"
-	done
-}
-
-src_configure() {
-	econf --sbindir=/usr/sbin
-}
-
-src_install() {
-	local docdir="/usr/share/doc/${PF}"
-	emake install DESTDIR="${D}" datato="${ED}${docdir}"
-	dosbin files/sgevt files/mdevt
-	rm -f "${ED}${docdir}"/{SCSIRAS,COPYING}
-	# install modepage files
-	insinto /usr/share/${PN}
-	doins files/*.mdf
-	dodoc ChangeLog AUTHORS TODO
-}
diff --git a/sys-block/scsirastools/scsirastools-1.6.6.ebuild b/sys-block/scsirastools/scsirastools-1.6.6.ebuild
new file mode 100644
index 000000000000..5ca7a0c6e0ba
--- /dev/null
+++ b/sys-block/scsirastools/scsirastools-1.6.6.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Serviceability for SCSI Disks and Arrays"
+HOMEPAGE="http://scsirastools.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND=">=sys-apps/sg3_utils-1.44"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-prefix.patch
+	"${FILESDIR}"/${P}-autotools.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+
+	# remove pre-compiled binaries
+	rm files/ialarms* || die
+}
+
+src_configure() {
+	econf --sbindir=/usr/sbin
+}
+
+src_install() {
+	default
+	dosbin files/sgevt files/mdevt
+
+	# install modepage files
+	insinto /usr/share/${PN}
+	doins files/*.mdf
+}
diff --git a/sys-block/sedutil/Manifest b/sys-block/sedutil/Manifest
index 87f190339759..43816c01bd06 100644
--- a/sys-block/sedutil/Manifest
+++ b/sys-block/sedutil/Manifest
@@ -1,3 +1,5 @@
 DIST sedutil-1.15.1.tar.gz 297551 BLAKE2B 233ce75a75e298cf77b5737ab8a072b615ea1ee6f13936d4bd2c35d26036fe663efd2ccbf23e7bb1506230014e8282f590a8905a1349a2d7f0d8c77848a613e5 SHA512 9708ef307b457fad2f45735b044685ac6731c353af428c49ff0e312190f3bdc521bcfa71a9e1239d9ffe637d18293a99b09b7e001df96494cdce53f5442750f1
+DIST sedutil-1.20.0.tar.gz 301067 BLAKE2B 6eb18b15a00a2555684459f00c59a9ffa1c0a85ab275bfd4de50225e3e7e9990751c7e4065987527f9c9c798c52abb5d45ef2336c72d6ee1c0e06c8a668ca210 SHA512 b85891f1c519295bf9551ffc2488300611f519aec88c60d74555e0870e125efd6153a49a6ae5a9783102e0ad0fbb148a0c0a804a61984934c23020add85287d3
 EBUILD sedutil-1.15.1.ebuild 568 BLAKE2B 17152c8491cd36b7570d3e61b7281833bd5f87e8ab0cb8d8e29b886e51ea9ecb39f1ccf6909f9825df277dad21a05388ced24862c57dc0db6573bf03028e7616 SHA512 d41fd49f59f100717e9f375d6a34001ae7a4b2998d1aaf2d66f310e520808cb5eef5f1a15aa0c4ab79ea597c364b26cb1cc1ad5c8116de5745437c35ef9b51b1
+EBUILD sedutil-1.20.0.ebuild 577 BLAKE2B 29e44a586904a5d1032e04283d3092f33cb7acceb179e05910653cdf7c72e8f76513bf150f2e97b56d0f61c9d045bc870fcff250b050c7fac101a2d9ec2159db SHA512 e5315f8a1fb54743fc20846c596fcce972bc57e0ace89e801bd39d21452dc54971e1f4a248c0bc1ad5f7d03318b5e4158b88003e8b120c2f4efc5fc407e697ad
 MISC metadata.xml 311 BLAKE2B 759819d08ad9f60ef24922d6520618640ced0b1c3a7973c92c4ae63029e6dfc4183b4dbbfac4d1d97b8de10c6cef371da0dbb507d4cde00dda21e6667863f2dd SHA512 b5e52382be6323223e43fbdf2e6fdf2d3e7b264b16c72cf8f27e052e1025080147809c79cd30d58299ce8ba7b9fac6ffaff82c33cefd0244a608103abb37bb31
diff --git a/sys-block/sedutil/sedutil-1.20.0.ebuild b/sys-block/sedutil/sedutil-1.20.0.ebuild
new file mode 100644
index 000000000000..07ea9f298216
--- /dev/null
+++ b/sys-block/sedutil/sedutil-1.20.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="The Drive Trust Alliance Self Encrypting Drive Utility"
+HOMEPAGE="https://github.com/Drive-Trust-Alliance/sedutil"
+SRC_URI="https://github.com/Drive-Trust-Alliance/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+src_prepare() {
+	default
+	# https://github.com/Drive-Trust-Alliance/sedutil/pull/49
+	sed 's: -Werror: :g' \
+		-i configure.ac \
+		-i Makefile.am || die
+	eautoreconf
+}
diff --git a/sys-block/targetcli-fb/Manifest b/sys-block/targetcli-fb/Manifest
index 1a1788d8967d..de8188c2a528 100644
--- a/sys-block/targetcli-fb/Manifest
+++ b/sys-block/targetcli-fb/Manifest
@@ -1,5 +1,5 @@
 DIST targetcli-fb-2.1.53.tar.gz 39586 BLAKE2B 35e5cea72580ba26b8397027e92446c129af5a94ab9458eed63ec731289065bcce759a77558a022c41b4ed73eefe865000e60b4e17816836f13056cb07071069 SHA512 acefa7f8df8ee901cae8f04cbeb264d6024100e2d8b8343024bc52842af88a23d1bf5dd880ff2c77046bd8da8493630b4e357103617c02d1a90947e42c3a7c92
 DIST targetcli-fb-2.1.54.tar.gz 39565 BLAKE2B 6eeb7da39fb047f9123fe12ea92a41d8e6fbd6728fdde8e1315e0c0224ad8abfa29df798680949d89cad6ff5afcac8112bbcc63b019f6245eff12089ea7b64d3 SHA512 dd008b8c47acc095078454c94b0c6f19ba88f86ddf1b5335eb050abf61d89ce1ffb7411ff3a174de60ed9759e6337206253aa9b2def6497b85c884a0a111308d
 EBUILD targetcli-fb-2.1.53.ebuild 722 BLAKE2B 3bf4c7bec7c29dd77a2b5932c8c0404f203682badf9ee584328be1fb5856e5edbac312709ca51c1c761b89e46267b5bd19cf04dc45ddbe0c96a80eb95e60d16e SHA512 dd69231c84a1efb39996e0f8288e07610c3564eff60a3e6d69857ed0aac485fbd65ecaff33f3f372d3eddd8dad0f0cfb1085fe608c663c8d154c928604b4d7e5
-EBUILD targetcli-fb-2.1.54.ebuild 784 BLAKE2B b29ca6b17f5ea53550944d13bc273e304ef0cd9ad4cb1ed3e7503301f3fcb4cc62f924b185502b71f10b8304d221742a4b3a68e8c2c924941e0855c0e856f3ea SHA512 b86cc706e963a2a5cbef87cecc0fe329a0488f99e31acd046c4063aa2170a7b146dbb36d98a7b9ae07be0a1d33f956e030784dd32c383e6d0b8e7658fe7d13aa
-MISC metadata.xml 766 BLAKE2B 2586ab9e1959ac6f42f93181e9f7491be744952d7165cbaca338d783af9bf9a7c486430a73cc4b03d5db08470679931d7b95f57ddce920fb3a744037c8c2abef SHA512 88a10d8316bcda83b916de5d799a13c993e98f51dbb3ceef0a6dce0406bfb26f2656effcc70e7cddcdb1ccd135d8ec1ce642b04b43c5a0330b6721c258a371a9
+EBUILD targetcli-fb-2.1.54.ebuild 782 BLAKE2B 344e6eecf56106b9a10af722f588042d89c3717b3bd1fab65ab67b826506bd68d06b16035a6297c5f6b9421619a38ecd23c05a2989d55160d644dc963c8d702c SHA512 654a345a5dbdb30b327a886b8c71417422651e627bf0adc635592e40e31852c5f68da6621973e3a28e6e7f7b724ec4d3a42c86e16ae0bede0d41a8b659c700a9
+MISC metadata.xml 545 BLAKE2B 91984af1bb12eab76b905c53a959f7e2ecd9ed40cacc4dae6a4917a69dc51a77408d78103a30f34ff1005b7143cbf480327b3d42ceca98d993ace4077ce50ed3 SHA512 06d26aad9c2ed8a9725fd5395415bba476b150c817aee39fb56aa456e2f36dd59449255b4e9250d0745895eaeb0df286538ba13eaf4e9f6bb83ed198dd0fe6b2
diff --git a/sys-block/targetcli-fb/metadata.xml b/sys-block/targetcli-fb/metadata.xml
index f75ae0b5a0dc..10c5405f7c25 100644
--- a/sys-block/targetcli-fb/metadata.xml
+++ b/sys-block/targetcli-fb/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person" proxied="yes">
-	<email>sir.suriv@gmail.com</email>
-	<name>Diogo Pereira</name>
-</maintainer>
-<maintainer type="project" proxied="proxy">
-	<email>proxy-maint@gentoo.org</email>
-	<name>Proxy Maintainers</name>
-</maintainer>
+<!-- maintainer-needed -->
 <stabilize-allarches/>
 <upstream>
 	<maintainer status="active">
diff --git a/sys-block/targetcli-fb/targetcli-fb-2.1.54.ebuild b/sys-block/targetcli-fb/targetcli-fb-2.1.54.ebuild
index 5392599bfcad..082c0fae52ba 100644
--- a/sys-block/targetcli-fb/targetcli-fb-2.1.54.ebuild
+++ b/sys-block/targetcli-fb/targetcli-fb-2.1.54.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/open-iscsi/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="dev-python/configshell-fb[${PYTHON_USEDEP}]
 	dev-python/pygobject:3[${PYTHON_USEDEP}]
diff --git a/sys-block/tw_cli/Manifest b/sys-block/tw_cli/Manifest
index eff095ca7fb6..81fb84c84bcf 100644
--- a/sys-block/tw_cli/Manifest
+++ b/sys-block/tw_cli/Manifest
@@ -1,6 +1,5 @@
 DIST 368_tw_cli_debian8_beta.tgz 1958337 BLAKE2B 5e10c253a36132c8ee74e555b7e9151e70dd126ab4e58a76465c6d198387d612f19bd121c1d4dee49ca6c6fc35aeef5ed19466f05d3ce59ac4c4ab2d6f488f65 SHA512 1a0e22bd59eed4d26957bf17dd191f842251e61c035973cfc0e4611b0f93d798e718bed2dcb54e3fbf9ac8bbc9f7aaf9b332c419210331c318fb507a9d34492c
 DIST CLI_linux-from_the_10.2.2.1_9.5.5.1_codesets.zip 1878621 BLAKE2B 628070e5f6dc4dbc75f029067298be278b696b84afb245d19761043183bc6232fcf48dfe46954ef61e027082d974905244f6b3e73b596fbbe8d7955375859be2 SHA512 e8a7f27401e7811d5f8533d839066bdf6d93eeb2cb1242b00af7fc559b0a34316f8e6dc80f68e869d97f44290ea32c9e65d1d857c1010009ad1a540252400e31
 DIST LSI-tw_cli 35638 BLAKE2B 8267d311b7b09dd3f0e619fd7d5aadcaf5b24afa1958c99e838b9280b175b8f070dc58164622bf3ab54dc5ddfc24a4a4ea06971a919b17a3c2594541e43ea41f SHA512 1a1d35395ffccf70004b0c111d8c4a7e408cf0c57503bb4d1fdd608f9b71d6ea4d7488307dd6806eaf6557d65badd9c43aeea3e7c1ddae1c56962c85c2b868c9
-EBUILD tw_cli-10.2.2.1-r1.ebuild 4321 BLAKE2B 9375865f4adb0e9f695ad44fbba32caa74e2198b7444ad4ae7f9cdae125de42f828c7f1983361fafa7e46204e76b3aa8d98f5052260642c293a424d964c5bd53 SHA512 f4832cb03a8f32b3d9cbe3aa0ba0027f9d0e8fc3b0a5968e31d9c23954821ee09556d31c113f8c4b7f23d31f0750da464193d5c8cd6d48e90004d23e4bdcf87c
-EBUILD tw_cli-10.2.2.1.ebuild 3758 BLAKE2B ca5813bbe16718e4c226252fd29ee540fc4e6c413b0856dbd72c18d3a6c501262078db6ead7e6c6dfae82c6823d0d1d2ca0e3566e022246443b6075c11800a3e SHA512 8bfefd45ac7e0a5243e2098b45b36e69f97aab82149082d27c628aedc567c2d655b5a8398f7bead1fb08ae5104801b7f91e21e2c79eb551f40ca01b724ecdbb3
+EBUILD tw_cli-10.2.2.1-r2.ebuild 4273 BLAKE2B b10c884adc46ba939433cade1117463041fd485bc8671d9ff8e329ee863b6f5d089bbe4c189d546ffedf91ccc5b70ac7c5866d36298ad5f565d2b12cf9e40cb0 SHA512 c3309b4c7badc20ddb4e9d800d8c8e09e2fa2a3fe6c096370ff8b8cc7fada17b6f148283c6f34d3e7deafa7b168cf6080936a74275d3ce21063bc90658687ca6
 MISC metadata.xml 312 BLAKE2B 1a7c7a4a804f7a8d329dacbfc40d811590d872fee32eb706c47aa40baa197e47cd0aade9fb6265a67de7af4e0bee68d775b35212ead03d058cab0e24f7592ae4 SHA512 d2803eddccaddf96f42bcdce826115038d71996e92abfb4d3bcc37eec4220f98b09c9c5f84da7d43619c1b40b85ca5ca189f3440d6142691c720c53e2df73862
diff --git a/sys-block/tw_cli/tw_cli-10.2.2.1-r1.ebuild b/sys-block/tw_cli/tw_cli-10.2.2.1-r2.ebuild
index dc6a4c2517b7..eb595dd6a5d0 100644
--- a/sys-block/tw_cli/tw_cli-10.2.2.1-r1.ebuild
+++ b/sys-block/tw_cli/tw_cli-10.2.2.1-r2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=8
 
 DESCRIPTION="3ware SATA/PATA/SAS RAID controller Command Line Interface tool"
 HOMEPAGE="http://www.lsi.com/products/raid-controllers/pages/3ware-sas-9750-8i.aspx"
@@ -16,11 +16,12 @@ SRC_URI_A_linux="CLI_linux-from_the_${PV}_${ThreeDM2_PV}_codesets.zip"
 # https://www.broadcom.com/support/knowledgebase/1211161501805/debian-8-twcli-causes-fault-segment-failure
 EXTRA_linux="https://docs.broadcom.com/docs-and-downloads/kb-documents/lsi/368_tw_cli_debian8_beta.tgz"
 EXTRA_fbsd=""
-[ -n "${SRC_URI_A_linux}${EXTRA_linux}" ] && SRC_URI+=" kernel_linux? ( ${SRC_URI_A_linux:+${SRC_URI_BASE}/}${SRC_URI_A_linux} ${EXTRA_linux} )"
+[[ -n "${SRC_URI_A_linux}${EXTRA_linux}" ]] && SRC_URI+=" kernel_linux? ( ${SRC_URI_A_linux:+${SRC_URI_BASE}/}${SRC_URI_A_linux} ${EXTRA_linux} )"
 # The license is not available easily from upstream (embedded in a textbox),
 # nor in the upstream tarball, but needs to be installed, and can't be
 # referenced via PORTDIR per bug #373349.
 SRC_URI+=" https://gitweb.gentoo.org/repo/gentoo.git/plain/licenses/LSI-tw_cli"
+S="${WORKDIR}"
 
 # the minor ver on the end changes...
 RELNOTES="${SRC_URI_BASE}/${PV}_Release_Notes.pdf"
@@ -55,16 +56,12 @@ SLOT="0"
 # This package can never enter stable, it can't be mirrored and upstream
 # can remove the distfiles from their mirror anytime.
 KEYWORDS="-* amd64 x86"
-IUSE=""
-
 RESTRICT="strip"
-QA_PREBUILT="/opt/tw_cli/tw_cli"
 
 # binary packages
-DEPEND="app-arch/unzip"
-RDEPEND=""
+BDEPEND="app-arch/unzip"
 
-S=${WORKDIR}
+QA_PREBUILT="/opt/tw_cli/tw_cli"
 
 # If you want to fetch it yourself (not from the mirrors), there is an IP-based
 # clickthrough to accept the EULA.
@@ -75,26 +72,26 @@ pkg_nofetch() {
 }
 
 src_install() {
+	local cli_bin
 	case ${ARCH} in
 		# Special case per 10.2.2.1 segfault
-		amd64) CLI_BIN=debian8/x86_64/tw_cli ;;
-		x86) CLI_BIN=debian8/x86/tw_cli ;;
-		#amd64) CLI_BIN=x86_64/tw_cli;;
-		#x86) CLI_BIN=x86/tw_cli;;
-		*) die "unsupported ARCH";;
+		amd64) cli_bin=debian8/x86_64/tw_cli ;;
+		x86)   cli_bin=debian8/x86/tw_cli ;;
+		*)     die "unsupported ARCH";;
 	esac
 	exeinto /opt/tw_cli
 	# The names have varied in the past, sometimes there is a suffix
-	newexe ${CLI_BIN} tw_cli
+	newexe ${cli_bin} tw_cli
 	dosym ../../opt/tw_cli/tw_cli /usr/sbin/tw_cli
 
 	newman ${PN}.8.nroff ${PN}.8
-	dohtml *.html
 	dodoc *.txt
+	docinto html
+	dodoc *.html
 
 	# to comply with license requirement 3.1.b, per upstream request.
 	insinto /opt/tw_cli
-	newins "${DISTDIR}"/"${LICENSE}" LICENSE
+	newins "${DISTDIR}/${LICENSE}" LICENSE
 }
 
 pkg_postinst() {
diff --git a/sys-block/tw_cli/tw_cli-10.2.2.1.ebuild b/sys-block/tw_cli/tw_cli-10.2.2.1.ebuild
deleted file mode 100644
index 1cb92bf7a2f9..000000000000
--- a/sys-block/tw_cli/tw_cli-10.2.2.1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-DESCRIPTION="3ware SATA/PATA/SAS RAID controller Command Line Interface tool"
-HOMEPAGE="http://www.lsi.com/products/raid-controllers/pages/3ware-sas-9750-8i.aspx"
-
-# This is apparently what the upstream stuff was based on when LSI took over?
-ThreeDM2_PV="9.5.5.1"
-
-SRC_URI_BASE="http://www.lsi.com/downloads/Public/SATA/SATA%20Common%20Files/"
-SRC_URI_A_linux="CLI_linux-from_the_${PV}_${ThreeDM2_PV}_codesets.zip"
-SRC_URI="kernel_linux? ( ${SRC_URI_BASE}/${SRC_URI_A_linux} )
-		 https://gitweb.gentoo.org/repo/gentoo.git/plain/licenses/LSI-tw_cli"
-# The license is not available easily from upstream (embedded in a textbox),
-# nor in the upstream tarball, but needs to be installed, and can't be
-# referenced via PORTDIR per bug #373349.
-# the minor ver on the end changes...
-RELNOTES="${SRC_URI_BASE}/${PV}_Release_Notes.pdf"
-
-# Note: 3ware gave permission to redistribute the binaries before:
-# Ref: https://bugs.gentoo.org/show_bug.cgi?id=60690#c106
-#
-# Please note that the LSI-tw_cli license does allow redistribution, despite
-# being a EULA:
-# 2. Grant of Rights
-# 2.1 LSI Binary Code. Subject to the terms of this Agreement, LSI grants
-# to Licensee a non-exclusive, world-wide, revocable (for breach in
-# accordance with Section 7), non-transferable limited license, without
-# the right to sublicense except as expressly provided herein, solely to:
-# (c) Distribute the LSI Binary Code as incorporated in Licensee's
-# Products or for use with LSI Devices to its Subsequent Users;
-# (d) Distribute the Explanatory Materials related to LSI Binary Code only
-# for use with LSI Devices;
-#
-# 3. License Restrictions
-# 3.1. LSI Binary Code. The Licenses granted in Section 2.1 for LSI Binary
-# Code and related Explanatory Materials are subject to the following
-# restrictions:
-# (a) Licensee shall not use the LSI Binary Code and related Explanatory
-# Materials for any purpose other than as expressly provided in Article 2;
-# (b) Licensee shall reproduce all copyright notices and other proprietary
-# markings or legends contained within or on the LSI Binary Code and
-# related Explanatory Materials on any copies it makes; and
-LICENSE="LSI-tw_cli"
-SLOT="0"
-
-# This package can never enter stable, it can't be mirrored and upstream
-# can remove the distfiles from their mirror anytime.
-KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-
-RESTRICT="strip"
-QA_PREBUILT="/opt/tw_cli/tw_cli"
-
-# binary packages
-DEPEND="app-arch/unzip"
-RDEPEND=""
-
-S=${WORKDIR}
-
-# If you want to fetch it yourself (not from the mirrors), there is an IP-based
-# clickthrough to accept the EULA.
-pkg_nofetch() {
-	einfo "Upstream has implemented a mandatory clickthrough EULA for distfile download"
-	einfo "Please visit ${SRC_URI}"
-	einfo "And place ${A} into your DISTDIR directory"
-}
-
-src_install() {
-	case ${ARCH} in
-		amd64) CLI_BIN=x86_64/tw_cli;;
-		x86) CLI_BIN=x86/tw_cli;;
-		*) die "unsupported ARCH";;
-	esac
-	exeinto /opt/tw_cli
-	# The names have varied in the past, sometimes there is a suffix
-	newexe ${CLI_BIN} tw_cli
-	dosym /opt/tw_cli/tw_cli /usr/sbin/tw_cli
-
-	newman ${PN}.8.nroff ${PN}.8
-	dohtml *.html
-	dodoc *.txt
-
-	# to comply with license requirement 3.1.b, per upstream request.
-	insinto /opt/tw_cli
-	newins ${DISTDIR}/${LICENSE} LICENSE
-}
-
-pkg_postinst() {
-	elog "This binary supports should support ALL cards, including, but not"
-	elog "limited to the following series:"
-	elog ""
-	elog "PATA: 6xxx, 72xx, 74xx, 78xx, 7000, 7500, 7506"
-	elog "SATA: 8006, 8500, 8506, 9500S, 9550SX, 9590SE,"
-	elog "      9550SXU, 9650SE, 9650SE-{24M8,4LPME},"
-	elog "      9690SA, 9750"
-	elog ""
-	elog "Release notes for this version are available at:"
-	elog "${RELNOTES}"
-}
author	V3n3RiX <venerix@koprulu.sector>	2022-03-20 00:40:44 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2022-03-20 00:40:44 +0000
commit	4cbcc855382a06088e2f016f62cafdbcb7e40665 (patch)
tree	356496503d52354aa6d9f2d36126302fed5f3a73 /sys-block
parent	fcc5224904648a8e6eb528d7603154160a20022f (diff)