gentoo resync : 20.03.2022

21 files changed, 36 insertions, 312 deletions

diff --git a/app-benchmarks/Manifest.gz b/app-benchmarks/Manifest.gz
index ba17868f3019..3a9b7040fd1c 100644
--- a/app-benchmarks/Manifest.gz
+++ b/app-benchmarks/Manifest.gz
diff --git a/app-benchmarks/cpuburn/Manifest b/app-benchmarks/cpuburn/Manifest
index 839f778d8546..6e68ba8702cf 100644
--- a/app-benchmarks/cpuburn/Manifest
+++ b/app-benchmarks/cpuburn/Manifest
@@ -1,4 +1,4 @@
 AUX cpuburn-1.4a-variables.patch 879 BLAKE2B b1ede6e0c0086caf3b87bd13753a120b47079339aa8d898661119afa2f9c90c4074c2e05e16a5980afcdc31370867b2a72c53d737c7fe66541cb2c8a998bc5e4 SHA512 eef2f5dfc3a49712568001a273be117126beac27560b6e4386e89893ef30acda76c956b96a9a86bf1a0a424003f3eb9214a8a4a1c828fcbbf809eed82a5a7af7
 DIST cpuburn-1.4a.tar.gz 9277 BLAKE2B f362380d0f57fd888ee5e5cf8fdf1809ffbc44fc3c3935b64adbd2c29ad0b3f93e5c032fdc265355574625417e7f5f9e9012e6f637c87fe0ae5e2043258f0822 SHA512 db84cabe70af0b6b3579c746f6df08c268b7145c9521fc609ce5b4cfd497dbb0639e52ab55f34110cff297ec23cf1413db28c6bff4e6f81a69722626886df7ce
-EBUILD cpuburn-1.4a-r3.ebuild 1358 BLAKE2B 61eed5731e5f1244521f229cd7ce420138c1e8af5820a3e0dc467171174fb6e293d4b31a6452f9ef85b908c5b811bb7baaf30ff4a9c48f336aba5b9e04478f07 SHA512 54357193326c9586fc80772bcc8200dba4646942c3e19662cf7fd77bfdcf66cf9b79b77957b5cdac094d8d082bd8cf9ee5e1f31a20c2bda2facc1138ea037fd7
+EBUILD cpuburn-1.4a-r4.ebuild 1358 BLAKE2B c379750884d62f22feed54934384ed22e0b6bdb652d6ce3ee5c14acdc5609a7c424784476588ca2d7899c6253dc34fee8951695f7c4cb462e5ae2678e446b7cd SHA512 44c93ee38662423a8c1d47f9c93679a516d72dff436f0e65d02fe4895f62572ba096515b35474575af602e441887fb211a32edadbe77adbaced197ded45e7be8
 MISC metadata.xml 484 BLAKE2B 6aac7c4a6f99081b2accfad835e5e31043da1fb25cb39f556383a22f2bee2cfa8306d46fd3c76dd8a1efe87c0e11effb6479db31d02c68c316e7c75da263924b SHA512 abed38b662f699d54a06462c51b1f51f48e7797ad3ae9570ef29bf86f38096193d8636ebca9dabf7fac8de4e3165de7044a0ccf23e77beeb2be39adfc1b1e79f
diff --git a/app-benchmarks/cpuburn/cpuburn-1.4a-r3.ebuild b/app-benchmarks/cpuburn/cpuburn-1.4a-r4.ebuild
index 0026ef70327e..7c532a610978 100644
--- a/app-benchmarks/cpuburn/cpuburn-1.4a-r3.ebuild
+++ b/app-benchmarks/cpuburn/cpuburn-1.4a-r4.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 MY_PV="${PV/./_}"
 
diff --git a/app-benchmarks/geekbench/Manifest b/app-benchmarks/geekbench/Manifest
index 6be3fc9b80f7..f2f3659020f1 100644
--- a/app-benchmarks/geekbench/Manifest
+++ b/app-benchmarks/geekbench/Manifest
@@ -2,12 +2,10 @@ DIST Geekbench-2.4.2-LinuxARM.tar.gz 1921401 BLAKE2B 34d86178e35d586b79182b33203
 DIST Geekbench-2.4.3-Linux.tar.gz 3337551 BLAKE2B cb660f3c08cc812cb23374032490a148449a36845fe63320788432493581ec6bd5958bf178d83d68b532ffbe5c7ee13e92b0bb00c0aca968bb2e499453f1b7a7 SHA512 d84e13eb5fd28fb232a5f93aa76f4855adcb9ccffbcd90dacc3e2b45231afd82e78d40c63f729391e5d00e95c14653e83757faca4e543c6306dd913c4e0edb87
 DIST Geekbench-3.4.2-Linux.tar.gz 9986039 BLAKE2B 63d7e768d65bc033260a0d99da17df2e518750f19882e63dbc9bbe6ff0b52a8cddb35b9143e85c01838bf5d77a04599578fc0a57a3e6fd89e7aec8c8ffdd4f5b SHA512 a61a5d5481682baefdce64f6054c3373900e8cd585dcbfa2feabbf386032986b40b603619c552102401a83e0b748831d00af5b5b5278e88ef42dee176adf06e9
 DIST Geekbench-4.4.1-Linux.tar.gz 71076124 BLAKE2B 14c2b80c971798e7d2bb256e76c7ab9c48e8c1c389e2f7547a436f706ac4f21c1e52e564cd584893071ee2f9f0a4747cd03ea72cc728ff8e4f369d5cc794d77a SHA512 fa687d33a7d7a2d09c544e3d17de93f41cfa77915c708cd1ef0743f84f7f83df9d3f8df2872a8f85ed2c4c872e3cd41932685ffeb19cdb0ea047ab5116713420
-DIST Geekbench-5.4.3-Linux.tar.gz 93169377 BLAKE2B c84f99d7f5be1002d26179085cef21baee20e14c99114b78d6d04caadea3835d8a05f07431a8a16a6d58dda9e11f27836b9b8261bccbd0549b5172b94ebbfae4 SHA512 d86abc0d9b1dfd59074cdc3ce9ebf32f7b7bfbca1badc9d45c5284b6b76f29a600f1796b0fb582a2861611515660b0a2680317b1361822c8809b3584cf00b0ac
 DIST Geekbench-5.4.4-Linux.tar.gz 93166494 BLAKE2B c49f399378c00af35df0b17a90af2a92c4366a8ad62f6743144b46a54e81cea77ed5e190b66db2e59f76ac6e47f4ba00d392ab0ac16cbd9e876e99297cc4b7c8 SHA512 46008903e34e7f118886ad391b11ca69d977e8e0cb84b7b78419b0689fe02b3c72d67e1698655cdddee039b102a2314dacd2329b5496f0406f465c6781b83aac
 EBUILD geekbench-2.4.2-r1.ebuild 1028 BLAKE2B 75e84bed9e787a465867397f183eb8bcbd100a91c9ce5610bbd4b11b92ebf13aef9227fa8c8c06012a773bb872daa20c9bfc4754aa6ef9f1d16121f2ed2815b6 SHA512 497985b5c7a877473fa89ead3e04dfba6bb8a1df2042eaedc1964ee5dfbc3c4685fb389a96d9b1cda93f4badb174719af7765646cd6b957ed657dbf50c08337a
 EBUILD geekbench-2.4.3-r1.ebuild 1088 BLAKE2B f6699780652748451d42b106a2c74b5113778066ff83b92bf216e9da4efe63527cd454f84046be456d6e9266f4ee85efb4c3655f45bbe4e4ace3ab9867cc847c SHA512 1f8b1640a4e121767e51b6c4fcd9ff77cd60fe37f5010fb7bbb670d763fc1166beaefb5ec74b4acf8390ccc19956d1f9945151af61c37f7f2767c5f47c53c2c6
 EBUILD geekbench-3.4.2-r1.ebuild 1088 BLAKE2B d822b727b3fe1703fb60d48dec922cb34d9585b1500f3068d24712261bee6fb3bc0c0837316e286d593ed399b91cef8d4debcbf2c52728fef7a1a4e1d5bf5ba9 SHA512 c1f2e1fe7d45cef07586c0a82e3893229376136a6aed394ea9ac5712c0d69216226c31ce10bb81c3d8d66f46d32a83869e9df14e065ff169c8f6c172c4f3cb85
 EBUILD geekbench-4.4.1-r1.ebuild 1082 BLAKE2B a2ffb958cf707996944a6a1afd1a84d0fb6ea200de5f9bb28e09d5df3ee8d8ee247b3607bb823ab3311f4ed40b7f91d6b793ec8f5f66f058559cd9c90bb9fcad SHA512 be426669bf92c82d74eb2539529925f8fbfcae05ed80bc7d004677f5ccffc8fae870897f2dca4f31321dfb940f6f0646d8b0a86bbb61eb1d17d3836bfa0a54aa
-EBUILD geekbench-5.4.3.ebuild 1029 BLAKE2B 2c0f88dc035fa2865098f022d5d3aee83066e0c87cbf4770c39e6ee5a41406ff4c492b7ef1ac6293eb9ef4c2e95219a82f77eaf80949bc750297ec9f1d940fe3 SHA512 c09af2ba3e043276fb8a14eb7c8bb309b173c63739275b53147e96e6841cfdd3efd28fe4dcffbfdc493f13ad5b6e9487c7623b92c0e1f240b05c362e12fc6881
-EBUILD geekbench-5.4.4.ebuild 1030 BLAKE2B a08dc430269cb372146dead0e57b02618765718c77fa221caf21596686161428f719576985202fd40de257522457b4378cf20336986ff27e840d4123d1fb7e14 SHA512 1a5e2a5e0aec66bcde70af612f1b04936ab762b64a224862ad50f7f34beb330b9f1bd5e3c2db76625c5f455c390a66bc683f3e0320fd640e39cea03fe16ca466
+EBUILD geekbench-5.4.4.ebuild 1029 BLAKE2B 21713100ea8c346ede61964d9abc8b11b46724a52734a11df2ec7b4ca5b22cfabf817ed2a5403db02f89261f85cf331638dfe1c4de1720a3983cfec4905a134b SHA512 9fa94c3d28bf46fcc9c20cd81ff9e35c441522ea670fb2e640b5c245cca66d4b3281002ecb3769e1484490bdba9d39e5f5568288efe063651eb1e78d44685d1d
 MISC metadata.xml 251 BLAKE2B ba937d5724c861b8bfd1d287a325357d6a63656cf5c2314185a486be769eb22b39fa780b38c05407bce5f0707585d499a849a28e15a2fde9eebba6f529e686a3 SHA512 0fb5b55fc7db96153970767478727504fd0e87c1c8a77593f1f30720064e95776b92e4993f9aed076c983eee5cebca446fe8894e36fbcc02802bb1c158747dd3
diff --git a/app-benchmarks/geekbench/geekbench-5.4.3.ebuild b/app-benchmarks/geekbench/geekbench-5.4.3.ebuild
deleted file mode 100644
index 2c4984b7d2ab..000000000000
--- a/app-benchmarks/geekbench/geekbench-5.4.3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="A Cross-Platform Benchmark for Android, iOS, Linux, MacOS and Windows"
-HOMEPAGE="https://www.geekbench.com/"
-SRC_URI="https://cdn.geekbench.com/Geekbench-${PV}-Linux.tar.gz"
-S="${WORKDIR}/Geekbench-${PV}-Linux"
-
-KEYWORDS="-* amd64"
-LICENSE="geekbench"
-SLOT="5"
-
-RESTRICT="bindist mirror"
-
-QA_PREBUILT="
-	opt/geekbench5/geekbench5
-	opt/geekbench5/geekbench_x86_64
-"
-
-pkg_nofetch() {
-	elog "Please download ${A} from ${HOMEPAGE}/download/linux"
-	elog "and place it in your DISTDIR directory."
-}
-
-src_install() {
-	exeinto /opt/geekbench5
-	doexe geekbench5 geekbench_x86_64
-
-	insinto /opt/geekbench5
-	doins geekbench.plar
-
-	dodir /opt/bin
-	dosym ../geekbench5/geekbench5 /opt/bin/geekbench5
-}
-
-pkg_postinst() {
-	elog "If you have purchased a commercial license, you can enter"
-	elog "your email address and your license key with the following command:"
-	elog "geekbench5 -r <email address> <license key>"
-}
diff --git a/app-benchmarks/geekbench/geekbench-5.4.4.ebuild b/app-benchmarks/geekbench/geekbench-5.4.4.ebuild
index 099604ac1c64..64adc3adf0b5 100644
--- a/app-benchmarks/geekbench/geekbench-5.4.4.ebuild
+++ b/app-benchmarks/geekbench/geekbench-5.4.4.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=8
@@ -8,7 +8,7 @@ HOMEPAGE="https://www.geekbench.com/"
 SRC_URI="https://cdn.geekbench.com/Geekbench-${PV}-Linux.tar.gz"
 S="${WORKDIR}/Geekbench-${PV}-Linux"
 
-KEYWORDS="-* ~amd64"
+KEYWORDS="-* amd64"
 LICENSE="geekbench"
 SLOT="5"
 
diff --git a/app-benchmarks/interbench/Manifest b/app-benchmarks/interbench/Manifest
index e057f5b91587..cb7216aede6b 100644
--- a/app-benchmarks/interbench/Manifest
+++ b/app-benchmarks/interbench/Manifest
@@ -1,5 +1,5 @@
 AUX interbench-0.31-makefile.patch 449 BLAKE2B 3c9c0dcbc35c8294ab87e8ba4bd72c5fec4a01a49857de753a95b4eb436bc72657e569ed4f9dfbb759c078a053b47830a65a2e0d72747166815cb99ba54ac8af SHA512 2f4b648bcc879bd67dca83e22198cb18ac267ecf6e923cf23fbbc00b29cf36b57d37844e8095ae6c05c74f9ed538b3ee746e0f8d391349921f4514918a71f36a
 AUX interbench-0.31-musl.patch 330 BLAKE2B 9d7a4ec0b89154e11ecc42be926a20b0c2bdf4fd40e94c642040c77a997a20fc0f02a9e706875a038d420134ac3176ce4da4ec76d8bbd93b54a5c8969ff01747 SHA512 5b4142d49f97cfcbd758870780d85f4624ffdbe6521a1af000a47b5456d4549b8df327c66ab05501faa36ad8ce3ac9518b29ad61d4b1f7d51667ee9260d0ecaf
 DIST interbench-0.31.tar.gz 38791 BLAKE2B 8f5605c763be6be0fcb5b240d5022c578af98d470a8bdf61f0ebc2abe56e6439fa37b5ac4e3eae16c7aab902cc08fab25f0cb34a92c0eea05b287b7bef2abbb4 SHA512 ccad7f5a7ea10c3c56809725145bad17970c4fa8aafc4b962e4e79c56bfa05025fee140e5b70ec407158aca59bba47e6bbff14329516d9383801ffe4c0797a23
-EBUILD interbench-0.31.ebuild 695 BLAKE2B ee75de4e93e5c7811b2e4f6fbd9f6a38453d37a39ef5373f0324d86baddd662ec689ff369bba3d3223ffee72a7952bf6f430f3cba4438e6db05c6cb80ca35e28 SHA512 8555f2b646de2f818371eb84be2ba9437e519b7b7b27cad9f208cb8ce58d3dab538f93742358ed1ae03fc7eb2e364a57b842e796af7789c1352f5b08632116b3
+EBUILD interbench-0.31-r1.ebuild 695 BLAKE2B b4d9afc20911ef4d1ea21213e8ac06ee7dc7caaa89338c822e2c2075fb277ee76865df017d0f4a3f9c8ee17d1cc2b8bbe00540d11a3ac29c08ff765de27013aa SHA512 5c70e7e43d715b850affa05b2032f139561f4d8955ad7c34ca30ae0f18d2ab9c21ee12702a908f950117c0f587c4714a552c9c3ae1c570e6dcb9182a61b1c641
 MISC metadata.xml 754 BLAKE2B 20625f96bab7d9877790bdafa5ab81a78d817605bd8a4d60d7d3ff19ccca530e5426a880c2066a25fa8970da0a59a6b22e9cf959a27a6d3c66f4dfe1e5439b2b SHA512 f9f6ef5b2a51488a4eebcb4359f790c850b74779c4c0d7b5ca2658a5918aa45e9c8ab27cad06dbeac1356629ecc9267f3aefed0719c6daca09d29c6ba9dca99a
diff --git a/app-benchmarks/interbench/interbench-0.31.ebuild b/app-benchmarks/interbench/interbench-0.31-r1.ebuild
index 9735d348f47a..f52495b10492 100644
--- a/app-benchmarks/interbench/interbench-0.31.ebuild
+++ b/app-benchmarks/interbench/interbench-0.31-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
 
 inherit flag-o-matic toolchain-funcs
 
@@ -13,16 +13,16 @@ KEYWORDS="amd64 x86"
 LICENSE="GPL-2+"
 SLOT="0"
 
-PATCHES=(
-	"${FILESDIR}/${P}-makefile.patch"
-	"${FILESDIR}/${P}-musl.patch"
-)
-
 DOCS=(
 	"readme"
 	"readme.interactivity"
 )
 
+PATCHES=(
+	"${FILESDIR}/${P}-makefile.patch"
+	"${FILESDIR}/${P}-musl.patch"
+)
+
 src_prepare() {
 	default
 
diff --git a/app-benchmarks/iozone/Manifest b/app-benchmarks/iozone/Manifest
index 8d87a8ad897b..74dce22cea7f 100644
--- a/app-benchmarks/iozone/Manifest
+++ b/app-benchmarks/iozone/Manifest
@@ -1,10 +1,4 @@
 AUX iozone-3.488-gcc10-fno-common.patch 247 BLAKE2B 55ed33492fd2102e865272aa16eb7e0f10e1fdc05b5cd06392c1beb1090eb6c67d992919828941ff34d8582587290c680c8fd5be9240a90c4762211df7511b69 SHA512 2d06d41512e696103cfc8e8b8cf87488ad36fa62e90115754f231717169d33814298342c87a53d36ba6692a479b339b07ed13151d2027f0ab5879498b80e213b
-DIST iozone3_471.tar 1853440 BLAKE2B 280c821a439ad1bacbd749278385481678d644a59c14395482c8a088b0578285f389f376fb32ce3c3abde598f50d693fb0c7c9a3d6597765547a71c76d21ea1c SHA512 c61b2b8b5af3dccdb99b26aef8a0a4f2f5f467fc3985ac72ed4bb4fb36e4b7684ca6dbaa5bbc05ae0a4e73852e048e9fd2495eda9313f5abc4e631499d683aec
-DIST iozone3_484.tar 1863680 BLAKE2B 72d3d3125aec2dfc504bb00684ef325e85edffe0d6efcd519cd692cfa2b9b792a44c00313dc96eabbbb3ab850a7a440b3ca3d5b955c4f6092b08f92ebe5c332b SHA512 bb1ac0c1724a5d3c20e90c56c0b4a438b4aa50384cddc76f4b77f2c465f052fd3fae9217b77688a2c6caf5e90611123a97ea0cd8074b3678068a90e6dd7857b7
-DIST iozone3_487.tar 1873920 BLAKE2B f27edb85ebfd19e55dea239a4e5d595a84981c0249ec57148efdcce90a85a5cbf1e17f319de820a06410c66390ddd38efe1b90b31ed98c3bf979eea6fb25ccc7 SHA512 2f3a9d259ca531e45124e8ad55358706e2f9615f50fbf434e786b832622aa5f673dbed1b2706c6450c200e0af7f7374e40402e0b06ad116d5f2a0704a6156a1a
 DIST iozone3_488.tar 1873920 BLAKE2B 60e97d588a273c1af7a8c83ec207593fcf43766f92171774b974aa04a8df690a1a84aae4b448e4a6f9e4e9c7dc3cd98ad327a0ea196779e6dbe3a88326314eaf SHA512 033f9e6e7395fe84ae6f4ae8737544e399ac0f16e82ba95eed2a2d0df52b7efcbe0c9282abc68d3c5b53d859073c74bff2e8c34bc35e1e1cc887ed36ad5d840b
-EBUILD iozone-3.471.ebuild 1827 BLAKE2B cc1f65110f6ce76ee9e6e2184a257958e57d5811572f28cdb599c119fcf1c4f115d6e0f219bafe95a5c19720fd1f8e7061fd35bf18bd95bdb8687671900539b9 SHA512 0f2fe0a369e9ed68fc700d6b782df8e17efd668657091226af215fcf3d8fb591972e78abca9171d7c642177aecb4705d8ab04d685e601997ce0e932336575fca
-EBUILD iozone-3.484.ebuild 1925 BLAKE2B 4d6c9e5768db80e5e688f173ac99f6c29a30c5dbbecf908f633263a7725a70955f8b2b4c09630614cd1347ba8499f26839b8ac6462bcdd78da91cbbfc3df73b1 SHA512 53daa2c331922ba7ac4bff57847a3fb5f28a8b154343c18e299ac3198a9681ecc1b43e6de87717b200b48f670b2d9a9d9a606ffc233e47ecd5b60dd5e2c59203
-EBUILD iozone-3.487.ebuild 1925 BLAKE2B 4d6c9e5768db80e5e688f173ac99f6c29a30c5dbbecf908f633263a7725a70955f8b2b4c09630614cd1347ba8499f26839b8ac6462bcdd78da91cbbfc3df73b1 SHA512 53daa2c331922ba7ac4bff57847a3fb5f28a8b154343c18e299ac3198a9681ecc1b43e6de87717b200b48f670b2d9a9d9a606ffc233e47ecd5b60dd5e2c59203
-EBUILD iozone-3.488.ebuild 1559 BLAKE2B 80db82de27a3f1c4bb11f50045b406d42eeabbda77331520bdb2456eb7ef58116e86e90fec970159839aea09cb35444e409177a88aa83919492b66f93e5eda64 SHA512 fe9b626a9b575d149c964fb016a0bbe68addbdd689d8dfe5d59a82873d72478d54d341c01d79c19bec46f84174fbe2424b433a9ddbdef09ed9d4dc72e05024c1
+EBUILD iozone-3.488.ebuild 1561 BLAKE2B c1b20a3b0016e38bb0f4a868a2bfde75797981c9768c96060fc175265bad806ec950e65189df10bc5767c1c340865ecd6cbfa61c108e9ad74e3607e48169dd7f SHA512 f4a690b70fafc8ad8a5dfe4737864e981e26e335b00cc8bb3a6a01a99f09d6a50e0115cdc7e64e0af39c4e318714d32c3a761318fc9a0e8996ef06f1f8a2fb18
 MISC metadata.xml 250 BLAKE2B 0bf33d84e86ff8a3136c4f1c212083d26c325637069dc3fe836c3dc8f14ea05f81c3b00fa9af13ed95009d827254ac3e56267f890575ae56119bc603ed5666b7 SHA512 6adc5af98e2cbdadd61377d191bdf9ce50e9f0b29c87e611b4bb2afc0824878a3fe20e06db970b59e04360d930a333eaf0b6191933f52d9dcffedb59943fe6aa
diff --git a/app-benchmarks/iozone/iozone-3.471.ebuild b/app-benchmarks/iozone/iozone-3.471.ebuild
deleted file mode 100644
index 247a52b7b3e0..000000000000
--- a/app-benchmarks/iozone/iozone-3.471.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# TODO
-#        ->   linux-arm            (32bit)   <-
-#        ->   linux-AMD64          (64bit)   <-
-#        ->   linux-ia64           (64bit)   <-
-#        ->   linux-powerpc        (32bit)   <-
-#        ->   linux-powerpc64      (64bit)   <-
-#        ->   linux-S390           (32bit)   <-
-#        ->   linux-S390X          (64bit)   <-
-#
-#        ->   freebsd              (32bit)   <-
-#        ->   macosx               (32bit)   <-
-#        ->   netbsd               (32bit)   <-
-#        ->   openbsd              (32bit)   <-
-#        ->   openbsd-threads      (32bit)   <-
-#
-# ~ia64 ~s390 alpha(?)
-
-inherit toolchain-funcs
-
-DESCRIPTION="Filesystem benchmarking program"
-HOMEPAGE="http://www.iozone.org/"
-SRC_URI="http://www.iozone.org/src/current/${PN}${PV/./_}.tar"
-
-LICENSE="freedist"
-SLOT="0"
-KEYWORDS="amd64 arm ~ia64 ppc ppc64 ~sparc x86"
-IUSE=""
-
-S=${WORKDIR}/${PN}${PV/./_}
-
-src_prepare() {
-	default
-
-	# Options FIX
-	sed -i -e "s:CC	=.*:CC	=$(tc-getCC):g" \
-		-e "s:-O3:${CFLAGS}:g" src/current/makefile || die
-}
-
-src_configure() {
-	case ${ARCH} in
-		x86|alpha)	PLATFORM="linux";;
-		arm)		PLATFORM="linux-arm";;
-		ppc)		PLATFORM="linux-powerpc";;
-		ppc64)		PLATFORM="linux-powerpc64";;
-		amd64)		PLATFORM="linux-AMD64";;
-		ia64)		PLATFORM="linux-ia64";;
-		s390)		PLATFORM="linux-S390";;
-		*)			PLATFORM="linux-${ARCH}";;
-	esac
-}
-
-src_compile() {
-	emake -C src/current ${PLATFORM}
-}
-
-src_test() {
-	cd "${T}" || die
-	"${S}"/src/current/iozone testfile || die "self test failed"
-}
-
-src_install() {
-	dosbin src/current/{iozone,fileop}
-
-	dodoc docs/I* docs/Run_rules.doc src/current/Changes.txt
-	doman docs/iozone.1
-	cd src/current || die
-	dodoc Generate_Graphs Gnuplot.txt gengnuplot.sh gnu3d.dem
-}
diff --git a/app-benchmarks/iozone/iozone-3.484.ebuild b/app-benchmarks/iozone/iozone-3.484.ebuild
deleted file mode 100644
index c104e9f4dddc..000000000000
--- a/app-benchmarks/iozone/iozone-3.484.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-# TODO
-#        ->   linux-arm            (32bit)   <-
-#        ->   linux-AMD64          (64bit)   <-
-#        ->   linux-ia64           (64bit)   <-
-#        ->   linux-powerpc        (32bit)   <-
-#        ->   linux-powerpc64      (64bit)   <-
-#        ->   linux-S390           (32bit)   <-
-#        ->   linux-S390X          (64bit)   <-
-#
-#        ->   freebsd              (32bit)   <-
-#        ->   macosx               (32bit)   <-
-#        ->   netbsd               (32bit)   <-
-#        ->   openbsd              (32bit)   <-
-#        ->   openbsd-threads      (32bit)   <-
-#
-# ~ia64 ~s390 alpha(?)
-
-inherit toolchain-funcs
-
-DESCRIPTION="Filesystem benchmarking program"
-HOMEPAGE="http://www.iozone.org/"
-SRC_URI="http://www.iozone.org/src/current/${PN}${PV/./_}.tar"
-
-LICENSE="freedist"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-S=${WORKDIR}/${PN}${PV/./_}
-
-src_prepare() {
-	default
-
-	# Options FIX
-	sed -i -e "s:CC	=.*:CC	=$(tc-getCC):g" \
-		-e "s:-O3:${CFLAGS}:g" src/current/makefile || die
-}
-
-src_configure() {
-	case ${ARCH} in
-		x86|alpha)	PLATFORM="linux";;
-		arm)		PLATFORM="linux-arm";;
-		ppc)		PLATFORM="linux-powerpc";;
-		ppc64)		PLATFORM="linux-powerpc64";;
-		amd64)		PLATFORM="linux-AMD64";;
-		ia64)		PLATFORM="linux-ia64";;
-		s390)		PLATFORM="linux-S390";;
-		*)		PLATFORM="linux-${ARCH}";;
-	esac
-}
-
-src_compile() {
-	emake -C src/current ${PLATFORM}
-}
-
-src_test() {
-	cd "${T}" || die
-	"${S}"/src/current/iozone testfile || die "self test failed"
-}
-
-src_install() {
-	dosbin src/current/{iozone,fileop}
-
-	# decompress pre-compressed file to make QA check happy
-	gzip -d docs/Iozone_ps.gz || die
-
-	dodoc docs/I* docs/Run_rules.doc src/current/Changes.txt
-	doman docs/iozone.1
-	cd src/current || die
-	dodoc Generate_Graphs Gnuplot.txt gengnuplot.sh gnu3d.dem
-}
diff --git a/app-benchmarks/iozone/iozone-3.487.ebuild b/app-benchmarks/iozone/iozone-3.487.ebuild
deleted file mode 100644
index c104e9f4dddc..000000000000
--- a/app-benchmarks/iozone/iozone-3.487.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-# TODO
-#        ->   linux-arm            (32bit)   <-
-#        ->   linux-AMD64          (64bit)   <-
-#        ->   linux-ia64           (64bit)   <-
-#        ->   linux-powerpc        (32bit)   <-
-#        ->   linux-powerpc64      (64bit)   <-
-#        ->   linux-S390           (32bit)   <-
-#        ->   linux-S390X          (64bit)   <-
-#
-#        ->   freebsd              (32bit)   <-
-#        ->   macosx               (32bit)   <-
-#        ->   netbsd               (32bit)   <-
-#        ->   openbsd              (32bit)   <-
-#        ->   openbsd-threads      (32bit)   <-
-#
-# ~ia64 ~s390 alpha(?)
-
-inherit toolchain-funcs
-
-DESCRIPTION="Filesystem benchmarking program"
-HOMEPAGE="http://www.iozone.org/"
-SRC_URI="http://www.iozone.org/src/current/${PN}${PV/./_}.tar"
-
-LICENSE="freedist"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-S=${WORKDIR}/${PN}${PV/./_}
-
-src_prepare() {
-	default
-
-	# Options FIX
-	sed -i -e "s:CC	=.*:CC	=$(tc-getCC):g" \
-		-e "s:-O3:${CFLAGS}:g" src/current/makefile || die
-}
-
-src_configure() {
-	case ${ARCH} in
-		x86|alpha)	PLATFORM="linux";;
-		arm)		PLATFORM="linux-arm";;
-		ppc)		PLATFORM="linux-powerpc";;
-		ppc64)		PLATFORM="linux-powerpc64";;
-		amd64)		PLATFORM="linux-AMD64";;
-		ia64)		PLATFORM="linux-ia64";;
-		s390)		PLATFORM="linux-S390";;
-		*)		PLATFORM="linux-${ARCH}";;
-	esac
-}
-
-src_compile() {
-	emake -C src/current ${PLATFORM}
-}
-
-src_test() {
-	cd "${T}" || die
-	"${S}"/src/current/iozone testfile || die "self test failed"
-}
-
-src_install() {
-	dosbin src/current/{iozone,fileop}
-
-	# decompress pre-compressed file to make QA check happy
-	gzip -d docs/Iozone_ps.gz || die
-
-	dodoc docs/I* docs/Run_rules.doc src/current/Changes.txt
-	doman docs/iozone.1
-	cd src/current || die
-	dodoc Generate_Graphs Gnuplot.txt gengnuplot.sh gnu3d.dem
-}
diff --git a/app-benchmarks/iozone/iozone-3.488.ebuild b/app-benchmarks/iozone/iozone-3.488.ebuild
index 00423cba6544..d564c8a49563 100644
--- a/app-benchmarks/iozone/iozone-3.488.ebuild
+++ b/app-benchmarks/iozone/iozone-3.488.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
@@ -44,7 +44,7 @@ src_configure() {
 
 	# makefile uses $(GCC) in a few places, probably
 	# by mistake.
-	export GCC=$(tc-getCC)
+	export GCC="$(tc-getCC)"
 }
 
 src_compile() {
diff --git a/app-benchmarks/nbench/Manifest b/app-benchmarks/nbench/Manifest
index d0bfe8246200..86f8cd87cd8a 100644
--- a/app-benchmarks/nbench/Manifest
+++ b/app-benchmarks/nbench/Manifest
@@ -1,4 +1,4 @@
 AUX nbench-2.2.3-Makefile.patch 2616 BLAKE2B 60ac4ec24c7787ebf4c0f76c25c1ad1afcc96818a9c2c6dd6f5fb8b04de6ff6d3a6832f030c0f7cc7ddbebeca647bf129009926d7a550a7299b2f81e26cbef61 SHA512 9d5df03ec62ca535ae432a3644ae7903f0d8520d86d9bf16d3e715fabf63e124230ddd8f735f03599592a02bac4f06f95fdf427923fe54150bfb05f553011815
 DIST nbench-byte-2.2.3.tar.gz 111791 BLAKE2B 83b602f582af32fbf8e2440cf597e8fb605fba5e0c7e5ae070e4e759ad00ee86022123c7a8a5957382a03bb4c7450aa1a2633e8d98fc86d03ea52e7a8f2895ce SHA512 68ae34c083e2e01f0114e6ff9ce04df41d70facbb05533b4cb9432fd9856048fde28e5c024d92f202e5f2de10fe223fdb46570873b1e2f69b2c847779645dec8
-EBUILD nbench-2.2.3-r1.ebuild 948 BLAKE2B 284d64de97e7c0d1cdd5006c43a9ccad6ab2b7d0e4514aa829d802321d11626d63978ac6686a92383f30ba496b779d36aef0027e463c1bc3a2eda7927258bc89 SHA512 1a7dc3735d40326dc24f4ffeeea54b5806b04859da34f0f8490d08758384474255c57438f957191755621810643d8afedac4465dc1b8a7115384d4866d8473a0
+EBUILD nbench-2.2.3-r2.ebuild 896 BLAKE2B 678b6cc77e56d35391b83f82bc3f2074c0fb4b6f6b8d497bfeca41f30fe329e2b97e5528ef2144eb1e58232a79a2e5edfe47493833e4b27940215f3ab6d4f2c6 SHA512 d0c8c42c7d161c3e7c6b26b5d45de8b0d4655d5865b4e5e191c72813c155a0acd6695347887983aace84984278f093dff8b7ba22011b01fe52e7684b84db3226
 MISC metadata.xml 500 BLAKE2B 60929c663fe1d468da2cea49f13ef00aa90dabb277545697161f1a370e3808b3d49a469e44363b565296db172c20adb5e093d9f2d6e61f119833da616357ac08 SHA512 ad4e0ef7d70e599ba921dc6da48ac2de7d9a9045aecb0fffcb74eb46ed9c575e40d753243aa62e2bfe5d7dd12a58b3665570a0f592f29491e6a9b63bd404105e
diff --git a/app-benchmarks/nbench/nbench-2.2.3-r1.ebuild b/app-benchmarks/nbench/nbench-2.2.3-r2.ebuild
index 51cb305f3f54..2e1a44e3fbfd 100644
--- a/app-benchmarks/nbench/nbench-2.2.3-r1.ebuild
+++ b/app-benchmarks/nbench/nbench-2.2.3-r2.ebuild
@@ -1,32 +1,31 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-
-inherit toolchain-funcs
+EAPI=8
 
 MY_P="${PN}-byte-${PV}"
 
+inherit toolchain-funcs
+
 DESCRIPTION="Linux/Unix of release 2 of BYTE Magazine's BYTEmark benchmark"
 HOMEPAGE="http://www.tux.org/~mayer/linux/bmark.html"
 SRC_URI="http://www.tux.org/~mayer/linux/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="freedist"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~mips ppc ppc64 sparc x86"
-IUSE=""
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv sparc x86"
 
-S=${WORKDIR}/${MY_P}
 PATCHES=( "${FILESDIR}/${P}-Makefile.patch" )
 
 src_prepare() {
 	default
 
-	sed \
-		-e 's:$compiler -v\( 2>&1 | sed -e "/version/!d"\|\):$compiler -dumpversion:' \
-		-i sysinfo.sh || die "patching sysinfo.sh failed"
+	sed -e 's:$compiler -v\( 2>&1 | sed -e "/version/!d"\|\):$compiler -dumpversion:' \
+		-i sysinfo.sh || die
+
 	sed -e 's:inpath="NNET.DAT":inpath="/usr/share/nbench/NNET.DAT":' \
-		-i nbench1.h || die "patching nbench1.h failed"
+		-i nbench1.h || die
 }
 
 src_configure() {
diff --git a/app-benchmarks/stress-ng/Manifest b/app-benchmarks/stress-ng/Manifest
index a0ce756a55f6..30bf8ef19e5c 100644
--- a/app-benchmarks/stress-ng/Manifest
+++ b/app-benchmarks/stress-ng/Manifest
@@ -1,3 +1,3 @@
-DIST stress-ng-0.13.10.tar.gz 1044430 BLAKE2B 2b5c7ad42d31382ea236bfaf9b16ee5a5fb85e10eb9bde6bf2dead4fa1d5e52bb4df006a528b52706f6aa3b605502ac801f8ffcc37528f5233afb98310e9eaeb SHA512 9605545c241ee13bc94781b2676bc2a4e1aa5c94acd3f7e2826fd7a75fd6717f6de6f657aba0566bf66d709e53bcc4f5349496bdbfe9498cf3e1a576858cd8f1
-EBUILD stress-ng-0.13.10.ebuild 1103 BLAKE2B b04dcff6cd3f67445f6626720e536254dc08171bcd869cb8009a93650cc0c1c77acae1b330487be2d7f4d65d3fe99465d6d027f55359a007384d896495ec5b8b SHA512 5d31e87d2c850668ccce711f5a093c76925dbb7e2a8a7b9a3fddaa9b96b6e0ab913c8e9227efb24c023ede4045261a3db108665a94e694a2843b79a21d45b5e7
+DIST stress-ng-0.13.12.tar.gz 1091644 BLAKE2B f693535f7bf2d00dc741574b77c52f216bd8db6bd3766c41c1d117aa8847b3ae3afa674b67749c93239c72aae19b36f1b6bdb4c526dddfb5176ae0597814ad80 SHA512 735e68da8b63b550f5764c565567c5212302eec116591cf8e4a5c203c571fcaf68cf24fefeede7d4364683a021e5232ef9a99796d465eb0aa4094800eca19474
+EBUILD stress-ng-0.13.12.ebuild 1103 BLAKE2B b04dcff6cd3f67445f6626720e536254dc08171bcd869cb8009a93650cc0c1c77acae1b330487be2d7f4d65d3fe99465d6d027f55359a007384d896495ec5b8b SHA512 5d31e87d2c850668ccce711f5a093c76925dbb7e2a8a7b9a3fddaa9b96b6e0ab913c8e9227efb24c023ede4045261a3db108665a94e694a2843b79a21d45b5e7
 MISC metadata.xml 907 BLAKE2B a9669ec80f735f02c77ac78ceba8b49634346d92c1d10a1288559e2440241d8e75d6de970ae232f2d6b42f12258ffa826de513ba862eaba581faf5f44737d4e6 SHA512 12c241b1df81be6527cc5faa80cb177941dd25cfe3bd29ce8b9ba5a90457834a50c11a8d66b7bd6ad27a3959038d4eded4822ed85df924aa2f71bb9b9b667e13
diff --git a/app-benchmarks/stress-ng/stress-ng-0.13.10.ebuild b/app-benchmarks/stress-ng/stress-ng-0.13.12.ebuild
index c997ff6e3d0c..c997ff6e3d0c 100644
--- a/app-benchmarks/stress-ng/stress-ng-0.13.10.ebuild
+++ b/app-benchmarks/stress-ng/stress-ng-0.13.12.ebuild
diff --git a/app-benchmarks/stress/Manifest b/app-benchmarks/stress/Manifest
index 87cc885bbff6..331058a24967 100644
--- a/app-benchmarks/stress/Manifest
+++ b/app-benchmarks/stress/Manifest
@@ -1,3 +1,3 @@
 DIST stress_1.0.5.orig.tar.gz 105766 BLAKE2B 7bc4a1d7739828ccd4b58c814e8ded42cddbd0b226bb29e916fe220835bcfa9dcdb86191bb321247aa98bd0e58791556713770bdeda5dad399aa61f2703a766c SHA512 8ae2b74213e2a6e7d17948b8277bdd6143c135a6cee64fb43d183b10134eaea761981e1d76af86ea4700b2d41598d5ca53b17755e61982ab50802297b139b805
-EBUILD stress-1.0.5.ebuild 567 BLAKE2B 92b8b7a969a824607111560bad89e7db68ab702e7ddcb209b42536c082acc9428f4fa85069a14b55c678c5633beb50ac004a3d53ef89bf56ebc5feefe0bda5ee SHA512 c4c660930fad99bf1b079d1ead872805ef8b549883255b44859a767ab2968f84ee68ecc8ace37b0aef8006d7165369a1cc8719b9a47699a83387dc4392693972
+EBUILD stress-1.0.5.ebuild 574 BLAKE2B a0ae4ba67b2be6f64fa125984926ea72e2dd0b3ff7022f4a2cb9b1851848cf47414c4a3be75f720a73635fb9e9771453a35fc33d86483cebbf7213de68f83b8d SHA512 a2999c56678a5f18c35051229861c9dfa0f8dfc423fccbc0701356938bfabede0d0f2c825f858501dc870fe4c1cacd5916e93b9db644d4bbc5ba33f278bb9155
 MISC metadata.xml 449 BLAKE2B 3017469519500c11712693bec0d179d89a31b9765ca4ab21939c4d5730afb664db66f746b8825d0b71410d704dfef9ad9e6e53233254e01fcb12f1f117a3995b SHA512 eaa43980bce8b1a58010b80b31396313fa50966f9b7229fa201af689308b83f8acd0acdc4b2669793cb5652871865c895ca3708097b96a048c5b10087cea8b0b
diff --git a/app-benchmarks/stress/stress-1.0.5.ebuild b/app-benchmarks/stress/stress-1.0.5.ebuild
index adc0493fb5ba..e778fb60435a 100644
--- a/app-benchmarks/stress/stress-1.0.5.ebuild
+++ b/app-benchmarks/stress/stress-1.0.5.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=8
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/s/${PN}/${PN}_${PV}.orig.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
 IUSE="static"
 
 src_prepare() {
diff --git a/app-benchmarks/sysbench/Manifest b/app-benchmarks/sysbench/Manifest
index 683af134c4c7..b1ce7982467d 100644
--- a/app-benchmarks/sysbench/Manifest
+++ b/app-benchmarks/sysbench/Manifest
@@ -1,3 +1,3 @@
 DIST sysbench-1.0.20.tar.gz 1509630 BLAKE2B 9b63c1c2703fc2311e03561c8dde2c39b249b6aadffebddfd99cdcfb5319606a484132e9dcb23a4365aecfc1148c5c5c56c918ac8c363ffcb1beece26aaf15c7 SHA512 510453f26c4304eee74cff82a99356b668478f97eaf942fa3654a27692743b52d39dda526fa8d136568b5ad136157c8658ae5eb2ae4e8593b161dcd49621f24f
-EBUILD sysbench-1.0.20-r100.ebuild 1688 BLAKE2B a3cdc0531dedb48f2ab49bc1833bc5314a3155334c529d4f0bde2f7fcfe16152b1a6639f8b143c09410753a695f9f0a2bdb9827efb20c7271c32a6cca1c73679 SHA512 66f5301b28da607630587575687d8be8db431642589236a6e8b2786266bab9035896984ec54dce37420b3642379eeafa173939e310b9a65ba381596b880c6a1f
+EBUILD sysbench-1.0.20-r101.ebuild 1688 BLAKE2B 4e435035d9bdddc20b649dcdae3f5574b0c5f1f7f0d6508809e937f880b250c2d3018cc9f39aa3973408efe125102deeeb1bb7eee4aac0566224699fd8ac27da SHA512 453729e695435a6a449d9645f2c8e53a110f953dfd5980117aac5cc5009c226ee9de8aa6f0ff19fc7c07400353b9c0f9d373692d71eaf4a4446418002169085b
 MISC metadata.xml 571 BLAKE2B ac263378b26177f5429852d8455a5ad7a9cbf92c8a091a569ccfc376325d14c491cdb6a102067dcc9f0eee4951cce3ad468d017df1b1b73b9108cd0706b9f609 SHA512 b417d30d4a0fe76d4899e01ec6e3532ac3aab332e0e3fd112a8522079fe121bc715e68ddfc1407a8015c5ea8c02e3b3eea9308e614830cadb8b55baeaed08b79
diff --git a/app-benchmarks/sysbench/sysbench-1.0.20-r100.ebuild b/app-benchmarks/sysbench/sysbench-1.0.20-r101.ebuild
index 01b587f79b24..f7eb86f81ba2 100644
--- a/app-benchmarks/sysbench/sysbench-1.0.20-r100.ebuild
+++ b/app-benchmarks/sysbench/sysbench-1.0.20-r101.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
 
 LUA_COMPAT=( luajit )
 PYTHON_COMPAT=( python3_{7..10} )