gentoo resync : 28.04.2021

27 files changed, 127 insertions, 227 deletions

diff --git a/app-benchmarks/Manifest.gz b/app-benchmarks/Manifest.gz
index 03b85265d02f..46a657486f8f 100644
--- a/app-benchmarks/Manifest.gz
+++ b/app-benchmarks/Manifest.gz
diff --git a/app-benchmarks/acovea-gtk/Manifest b/app-benchmarks/acovea-gtk/Manifest
index 53a734d6de85..c4d7edc54103 100644
--- a/app-benchmarks/acovea-gtk/Manifest
+++ b/app-benchmarks/acovea-gtk/Manifest
@@ -3,5 +3,5 @@ AUX acovea-gtk-1.0.1-libbrahe.patch 351 BLAKE2B 9926469cb0812db675c89be708246207
 AUX acovea-gtk-1.0.1-libsigc.patch 6753 BLAKE2B b7a32cdc82f00e8add5ccff74e666667f170cce1113aa549ac3cdfdc241fcc55328804fa8e8ef14a888ddf0362440ada3f3cc34cbc9d611047e373684026396c SHA512 0f8463b8cec994a8fe1fe2a3971c9cc3f3d1427b7f3925cfdeb3a23ebcecfe324512830a80532ca904896c3314a72e75180dae9b10c2d0711d503c8bfc081ec0
 AUX acovea-gtk-1.0.1-unicode.patch 385 BLAKE2B ab96d0827004a7cd1dc1fb27af0db920d5ca3a0fa9770afebe3fb0a7cb52c9eb09c20651bb9dff26638d179c64dbbac721938a9c417a716444c3bfdaa2f8f3af SHA512 ea792ec464cc5d844eba769bb4246a7396b393d214834c6eaf8890ebf2d0de2d36e0e89dc89efdf753d046d1d3f032dc3806a20bf4360810bb8e1af56fc4d66e
 DIST acovea-gtk-1.0.1.tar.gz 407230 BLAKE2B ba8e27bc42e1cf7577c61a819a25b373c45738fb6788da9e4e40368ee3a64e363fcc66b43b80a357ba7ecf8e2b22937188c61457212e6051950fe5285e8e7629 SHA512 c26eb0059b0f6a8a77ebff2f9cad9a9d543a2932f035e520c40bc3b917d1570533be934571528b7e2e53932e56afa77eff108a1ac51678a514960563a775c2ed
-EBUILD acovea-gtk-1.0.1.ebuild 785 BLAKE2B 2baa669f0f3bee1ca8d5a3444c3fa480e8517221a8e3de0c870931837de82f438a50276b0b9f9c4c9fb2bdd15cb5dd60dc4055b54e49967d5fc5546c1668b509 SHA512 c0a3df2942f9131796858ab77450eb5ab2aeb47b2b2ed969dbc132ac266e766961c0bab75964a27019d8930e60f6ef39211f8162f2b2efab261032598ab6775d
+EBUILD acovea-gtk-1.0.1.ebuild 794 BLAKE2B e3cd08ce57ce3e28dd61a7ddf59c8771cf0a5848d38c2bb51adb224234ccc2e6ec28d183bf31c47235a8df19ec4b39bf4ebf83381b83a8f4eb2a982ce8ec417e SHA512 c1a46dc2540fc4046bb37c81d813db31209c4dd1a1e7db0dadd374179bb753efbce1608d4e6a85d1af10216d20bb923cd8d382b0edebeaa20134f3cb2d1cf6f1
 MISC metadata.xml 247 BLAKE2B 5a20af3c9732ef7dba68131a08988652f5c93a6d186a82c4deb1bb9c06dc3ae73152a0d241cc346637f7b11caf4676da43301ba596c67b66669535e71db0b03e SHA512 29cf52c16b0cce69899d9c2da8acd9144b7d760442aa323b854dceadb42459e009545193b1df7911ac2241b59f4819b4a6bb1d206d6f57953f770031433bb6b7
diff --git a/app-benchmarks/acovea-gtk/acovea-gtk-1.0.1.ebuild b/app-benchmarks/acovea-gtk/acovea-gtk-1.0.1.ebuild
index b4cb99ed03b9..1b45c819bea0 100644
--- a/app-benchmarks/acovea-gtk/acovea-gtk-1.0.1.ebuild
+++ b/app-benchmarks/acovea-gtk/acovea-gtk-1.0.1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit autotools eutils flag-o-matic
+EAPI=7
+
+inherit autotools desktop flag-o-matic
 
 DESCRIPTION="Analysis of Compiler Options via Evolutionary Algorithm GUI"
 HOMEPAGE="http://www.coyotegulch.com/products/acovea/"
@@ -18,8 +19,10 @@ RDEPEND=">=app-benchmarks/acovea-5
 DEPEND="${RDEPEND}"
 
 src_prepare() {
-	use unicode && epatch "${FILESDIR}"/${P}-unicode.patch
-	epatch "${FILESDIR}"/${P}-{libbrahe,libsigc,gcc4.3}.patch
+	default
+
+	use unicode && eapply "${FILESDIR}"/${P}-unicode.patch
+	eapply "${FILESDIR}"/${P}-{libbrahe,libsigc,gcc4.3}.patch
 	append-cxxflags -std=c++11
 	eautoreconf
 }
diff --git a/app-benchmarks/bashmark/Manifest b/app-benchmarks/bashmark/Manifest
index e97c8e924187..bae6fd26c08b 100644
--- a/app-benchmarks/bashmark/Manifest
+++ b/app-benchmarks/bashmark/Manifest
@@ -1,6 +1,6 @@
-AUX bashmark-0.6.2-as-needed.patch 362 BLAKE2B 6d6f5697f1da32395fb454ffe844b72799b7294559d8d390958a73b119159dd8ec138ed8ea34537349761c9b13820347b5f5657589f90125eac554f2a550edb5 SHA512 123afc84ec7131492054d28d6e41f32730328298fcb5f13055a56277d1c286352a3ff70d759fb307dc960fba413ad31102f04bf5b5df55d6052743d26b7bcad4
-AUX bashmark-0.6.2-gcc43.patch 2034 BLAKE2B c931cc7edea7fe1bd2d8939564896c352a4a33eb078e54214c20f9d56c5be533bb23787ad1240d7716dd55475ce67b09f611a3ed176810696ae9e248eae471c2 SHA512 48d1d0b2924d3640e8939f44989528a9a83fb56e436da21abb9301bbbbed28dbf2fa5e46b6631ac09531ed1ef218da685d21d5b3aeb48f147d56a1aa161bf09c
+AUX bashmark-0.6.2-as-needed.patch 197 BLAKE2B bc30f5592c51fbadcecd8371e353106fc887090b13c443610b79872efee4e271b0e5ad907e34c9b0a6a4a34a1023389e71253e557e8ff0f4cf462ff1f06e8433 SHA512 4b157186b888a28465bb3fb9fac957118daf45410fb9cfbbfe92b60a598e1a1a218bbafdac9152ee4649bcffa8de5874e1228740257ddafc772a1dd876ac61b2
+AUX bashmark-0.6.2-gcc43.patch 1517 BLAKE2B b125d0f92e679043a053cc36156cb3403fbabc7bb63381a56023442fbcb736b1816c3c2260ce0d40d17e557b15c6424f8ae7f08c67981ac26cd688eae98c8412 SHA512 0c8ab6ba0d6fd6be03ff0225d8d34aa4f52b3279836bcf2d5ecb15d3906864786d2bc4c4a0de4c16a28aea8b8cb4e401223a90bfa12cb1ba8ba95d9be8f98428
 AUX bashmark-0.6.2-gcc47.patch 631 BLAKE2B fbb465dfc0f5b68337bf15be09413209b4c6dc3cad1b11379723252320c96b26b4b6eaa7b16eda511201d9ee71aefd25368042587915edafd02184792dd9e843 SHA512 60b1c1dd529d7dcac0893f1cc5d74e5fdcecb2bfd5735e33c6445d9fbaa843258b9aaaee9627ba98db1f8237f4567b8868f4be483b681b130d5a34943d2d24b6
 DIST bashmark-0.6.2.tar.bz2 21944 BLAKE2B 63c6241dfe67dbd3961d7712a5b4c2f611846e3e5a7bfa1796ff14f03610d8db0a7f71239a4eec9eaba53c09274d12f320aa30d5ffc7462ff1a186b19c456256 SHA512 43935b44c1b871d724aca0e1a6dfd99c73c29ec276c4127186e8dc6c7b27d57554b8b32a7e2372cd0b78eb584df7ee169f51f47e6666f61eaacbe35c5d4074f8
-EBUILD bashmark-0.6.2.ebuild 541 BLAKE2B 1a9a38a97eba174c653492e1ae790dfb9c7bf23d9ecfde35e376e62733185454c69e4a53c6d2af2d74ce06793dd45f051174868ab1150d42e95021d0cd2c7945 SHA512 cfdce168c7343f0903b4bd5cb66bfdf7383d5f00263d1b2aba335d9535fbeb5023b30b3a9eb860ec7d7d139c0316fd8db16c7e95d40897205da42811a59d67c7
+EBUILD bashmark-0.6.2.ebuild 558 BLAKE2B b9c6ebf513b7fc55095e748d4b2cc3716f806196bfe46b23eccd4c16c01889040b8c8737006dce9af39b48850845bc2f4afbab0025b2241f9ef5de5da5ef6d8d SHA512 05d37650edae417985c67d2e22fd576c5028a155813c2f8fc0ec7477323f5fc845f468caf4572d80c1bdf4a67bfc91207f113b7a3289ad5bbd54b8d5f342cf8d
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-benchmarks/bashmark/bashmark-0.6.2.ebuild b/app-benchmarks/bashmark/bashmark-0.6.2.ebuild
index c50dd20f0339..6b8964a76be9 100644
--- a/app-benchmarks/bashmark/bashmark-0.6.2.ebuild
+++ b/app-benchmarks/bashmark/bashmark-0.6.2.ebuild
@@ -1,23 +1,28 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit eutils
+inherit toolchain-funcs
 
 DESCRIPTION="Geno's cross platform benchmarking suite"
 HOMEPAGE="http://bashmark.coders-net.de"
-
 SRC_URI="http://bashmark.coders-net.de/download/src/${P}.tar.bz2"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-as-needed.patch
-	epatch "${FILESDIR}"/${P}-gcc43.patch
-	epatch "${FILESDIR}"/${P}-gcc47.patch
+PATCHES=(
+	"${FILESDIR}"/${P}-as-needed.patch
+	"${FILESDIR}"/${P}-gcc43.patch
+	"${FILESDIR}"/${P}-gcc47.patch
+)
+
+src_configure() {
+	tc-export CXX
+
+	default
 }
 
 src_install() {
diff --git a/app-benchmarks/bashmark/files/bashmark-0.6.2-as-needed.patch b/app-benchmarks/bashmark/files/bashmark-0.6.2-as-needed.patch
index 6c01fd934e5d..7af9843a9bcc 100644
--- a/app-benchmarks/bashmark/files/bashmark-0.6.2-as-needed.patch
+++ b/app-benchmarks/bashmark/files/bashmark-0.6.2-as-needed.patch
@@ -1,6 +1,5 @@
-diff -ru bashmark-0.6.2-orig/makefile bashmark-0.6.2/makefile
---- bashmark-0.6.2-orig/makefile	2007-10-08 23:01:06.000000000 +0300
-+++ bashmark-0.6.2/makefile	2007-10-08 23:01:22.000000000 +0300
+--- a/makefile
++++ b/makefile
 @@ -10,7 +10,7 @@
  BIN = bashmark
  
diff --git a/app-benchmarks/bashmark/files/bashmark-0.6.2-gcc43.patch b/app-benchmarks/bashmark/files/bashmark-0.6.2-gcc43.patch
index 625abdab397b..02bded6c4765 100644
--- a/app-benchmarks/bashmark/files/bashmark-0.6.2-gcc43.patch
+++ b/app-benchmarks/bashmark/files/bashmark-0.6.2-gcc43.patch
@@ -1,6 +1,5 @@
-diff -NrU5 bashmark-0.6.2.orig/Benchmark.cpp bashmark-0.6.2/Benchmark.cpp
---- bashmark-0.6.2.orig/Benchmark.cpp	2008-06-29 11:53:07.000000000 +0200
-+++ bashmark-0.6.2/Benchmark.cpp	2008-06-29 11:54:02.000000000 +0200
+--- a/Benchmark.cpp
++++ b/Benchmark.cpp
 @@ -15,11 +15,11 @@
   *                                                                         *
   * You should have received a copy of the GNU General Public License       *
@@ -14,9 +13,8 @@ diff -NrU5 bashmark-0.6.2.orig/Benchmark.cpp bashmark-0.6.2/Benchmark.cpp
  #include "Main.hpp"
  
  
-diff -NrU5 bashmark-0.6.2.orig/main.cpp bashmark-0.6.2/main.cpp
---- bashmark-0.6.2.orig/main.cpp	2008-06-29 11:53:07.000000000 +0200
-+++ bashmark-0.6.2/main.cpp	2008-06-29 11:56:40.000000000 +0200
+--- a/main.cpp
++++ b/main.cpp
 @@ -17,10 +17,11 @@
   * along with this software; if not, write to the Free Software            *
   * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.               *
@@ -29,9 +27,8 @@ diff -NrU5 bashmark-0.6.2.orig/main.cpp bashmark-0.6.2/main.cpp
  
  #include "Output.hpp"
  #include "Sysinfo.hpp"
-diff -NrU5 bashmark-0.6.2.orig/Sysinfo.cpp bashmark-0.6.2/Sysinfo.cpp
---- bashmark-0.6.2.orig/Sysinfo.cpp	2008-06-29 11:53:07.000000000 +0200
-+++ bashmark-0.6.2/Sysinfo.cpp	2008-06-29 11:55:58.000000000 +0200
+--- a/Sysinfo.cpp
++++ b/Sysinfo.cpp
 @@ -15,11 +15,12 @@
   *                                                                         *
   * You should have received a copy of the GNU General Public License       *
diff --git a/app-benchmarks/dbench/Manifest b/app-benchmarks/dbench/Manifest
index bf2a39139a97..a670c1c0c6f9 100644
--- a/app-benchmarks/dbench/Manifest
+++ b/app-benchmarks/dbench/Manifest
@@ -1,3 +1,3 @@
 DIST dbench-4.0.tar.gz 2055359 BLAKE2B 20715b17472d0c6daaf1848873e33266272846447a207508c6801058ba91a38fe56045d8f6867df5814e7836e99cbd2675aad70a49021b04a3797e1231e20543 SHA512 70c65c5b079edf745c267be753919c780153c9064dbda95c270b3c2c1d8c16e84fab4e743eb777436813678ecff13ec2b55d011e8acc4bd83e58f0dda7438e7f
-EBUILD dbench-4.0.ebuild 866 BLAKE2B 689911d981a724f2e70272753ee2c732992d315b927e85692b508868ffa7b8c3a6f2b6f285e4324a1fa65f3b5a1ec28f19e3d85e1b5924faf89d927e077d5930 SHA512 1119cc63320a6a68b7a796da59ef574e8848624aec95e5a592f4075b0648a29153df59ee44b2442c52c9a4b3cfb391ad520ecfaa44fcfdfc6f8272858d875ef7
+EBUILD dbench-4.0.ebuild 862 BLAKE2B d1a7c2e589e848591c1723fed86849ac8d223de670c9a09dae72472abe0409ee300fa787a9b2e24333365244ab372e450401d36c20ff2ea6c9bb9b77039ff9cf SHA512 d7facbaf10f65856f0f8a9f438bce03040d6ac198c22cfe8b87ac76eb877c8a53b9c78b7b0fb530d04a96dc4b87ad93d57883a392d46c05619f3b4a5f1230d57
 MISC metadata.xml 247 BLAKE2B 5a20af3c9732ef7dba68131a08988652f5c93a6d186a82c4deb1bb9c06dc3ae73152a0d241cc346637f7b11caf4676da43301ba596c67b66669535e71db0b03e SHA512 29cf52c16b0cce69899d9c2da8acd9144b7d760442aa323b854dceadb42459e009545193b1df7911ac2241b59f4819b4a6bb1d206d6f57953f770031433bb6b7
diff --git a/app-benchmarks/dbench/dbench-4.0.ebuild b/app-benchmarks/dbench/dbench-4.0.ebuild
index 56219066741f..1e2cda61523d 100644
--- a/app-benchmarks/dbench/dbench-4.0.ebuild
+++ b/app-benchmarks/dbench/dbench-4.0.ebuild
@@ -1,27 +1,27 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit eutils autotools toolchain-funcs
+inherit autotools toolchain-funcs
 
 DESCRIPTION="Popular filesystem benchmark"
 SRC_URI="https://www.samba.org/ftp/pub/tridge/dbench/${P}.tar.gz"
 HOMEPAGE="https://www.samba.org/ftp/tridge/dbench/"
-SLOT="0"
+
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc x86"
-IUSE=""
 
 DEPEND="dev-libs/popt"
 RDEPEND="${DEPEND}"
 
 src_prepare() {
-	eautoheader
-	eautoconf
-	sed -i -e \
-		"s:\$(CC) -o:\$(CC) \$(LDFLAGS) -o:" \
-		Makefile.in || die
+	default
+
+	sed -i -e "s:\$(CC) -o:\$(CC) \$(LDFLAGS) -o:" Makefile.in || die
+	mv configure.{in,ac} || die
+
 	eautoreconf
 }
 
@@ -38,5 +38,5 @@ src_install() {
 }
 
 pkg_postinst() {
-	elog "You can find the client.txt file in ${ROOT}usr/share/dbench."
+	elog "You can find the client.txt file in ${EROOT}/usr/share/dbench."
 }
diff --git a/app-benchmarks/geekbench/Manifest b/app-benchmarks/geekbench/Manifest
index 501ed783b0ea..37a4e77c8e17 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.3.2-Linux.tar.gz 93056596 BLAKE2B 400bb854956fa74f0f3399b3d4d98f63e9c1e28890001cde55a2aa441cdf2d2aa2e7ede6565bad3defdbaf29913bde66f06a9b341134ccffc434021665a84a89 SHA512 03225a4837c02745723f0d5f65439c20977bd16243c1ee2ab6d1540828b54778de93c82ca5688b3bfefe0dea4e41fda43fdda633a9b1685382fd549742d580a9
 DIST Geekbench-5.4.0-Linux.tar.gz 93156197 BLAKE2B 5d41cbac86ab9a2f9df2a401c6081da3b4e4f4d405ae6913371eae4dbe3135dc781220fc0d43fea58bc4dbde6f1383a4a8cede82b16af813b8cd401d72b2cbcd SHA512 85f1ac0a9618ef08139f9a08051748b1c23827cf770c1e2abd7829a93d2f656b6dbb00fe194b92a15b6f94694142f2df62ed5113b50a6bec4777988e322bd2f3
 EBUILD geekbench-2.4.2.ebuild 1029 BLAKE2B 325e02bfccabae6f54f24fd7a5f601517eebaec7e51f6d9c4fb15adead8eaa255423fd69a2ed0788fa6e407c4cc7c228e23c2357f4d3699f2f1f725770eee79b SHA512 19d8807a97e5bfbea9155857740c2c3c6138c6366f426defde44976a224f89c48b7dd366bd1ec1079b49b45df0c0aaefaae6e5ca8d367a3034c2c26296385a53
 EBUILD geekbench-2.4.3.ebuild 1089 BLAKE2B 010a26131e1de8b5eb4d7735f10603dc9bcef864ee688b9ba71e6d20c79424b9818b0a99a33d0ad48804872964b4ecce0e69c5a6bafaba865c03a057a6f76e97 SHA512 58ced2485af8de54dfc1a6736b0ddac21089f208c895665aa043efc381a9f04db359bcc0c2db360455b6a55b02d0bcc489c7a65c9414f43d9006b821ce3e6a02
 EBUILD geekbench-3.4.2.ebuild 1089 BLAKE2B 8512afa8c9dc00969d53b4b743158ddc1f5abb94dcfca1312a55e5a75b4204abc67ad86d4902dd95fd1139934c7d2c3c83389434b5466cec490608b76870118a SHA512 ecb7293edca2f48939fe0736dc24c1b4ab71601ff434dfdb0b3e85fabeca6f6f64c343d49edc8ab4bd69a09a598bc7122e3b34be30a91de0aebd2521136a17b2
 EBUILD geekbench-4.4.1.ebuild 1083 BLAKE2B 58703fd44f5a9276dcb69c0a976e25afad4e3ff39eb4657dc2650fc804242193618ae6187d526343db8534396e91954d5bbda75a1c6f50ef49471f2c33ea47fb SHA512 82f9440171735d13befa0aa0120d4e722c416d7633ee08a46e7f8089bc177d8b206f546d34265dfd54428cd4c9a17d589f4b322ebd87434183e05c0592c268c3
-EBUILD geekbench-5.3.2.ebuild 1030 BLAKE2B 4d6e7cdc1b6df833af68ac9592fcc96aea1a8a6c7612add61df7c8f61a967c6c9d4992fa8b8e279dcbbd63dccfd9082aac415f4be4650767e04042985ddee51f SHA512 aa160280a524a86e8c78504255cc984a2ba18ca13ec0df019728f54841d18108844bea3e946091c2de3c30ac7f1c01659ac56c56cd7cc4aca77a6e01ae72ca2f
-EBUILD geekbench-5.4.0.ebuild 1031 BLAKE2B 25532425376ee29508a8aa262c0b2f914226a5949a8e47bd03b937c3464c1c034dc28d9e7c7cdc3bf100799f9f402d78209f5ffa80bccb23cbb229c6a13c578f SHA512 0999f6362bcae62a6e8d50ac7a8427f69717a5ac7ed5d85b23c70854af4dcfb24ed92656f0483b919e9303a31afa752396b7c9c8779048241d6f31e49429affa
+EBUILD geekbench-5.4.0.ebuild 1030 BLAKE2B 4d6e7cdc1b6df833af68ac9592fcc96aea1a8a6c7612add61df7c8f61a967c6c9d4992fa8b8e279dcbbd63dccfd9082aac415f4be4650767e04042985ddee51f SHA512 aa160280a524a86e8c78504255cc984a2ba18ca13ec0df019728f54841d18108844bea3e946091c2de3c30ac7f1c01659ac56c56cd7cc4aca77a6e01ae72ca2f
 MISC metadata.xml 250 BLAKE2B d57634b040c498296655940e3ee580c8580075a4190e2600113cee5548ff44a2025568380f3d5d9f3ca0fcd1ea5d41c9871395ffbcf4bd32d8df6a494852a885 SHA512 c225bdf339347a1768b255d905f3831904cdc375f3d4e90e41c68645b8bcfe2dfdf8e6aa4c67063103f459808a387c8edd9b35b073b8be175f7a3bd490fe3dca
diff --git a/app-benchmarks/geekbench/geekbench-5.3.2.ebuild b/app-benchmarks/geekbench/geekbench-5.3.2.ebuild
deleted file mode 100644
index 87ca7c029dbb..000000000000
--- a/app-benchmarks/geekbench/geekbench-5.3.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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"
-
-KEYWORDS="-* amd64"
-LICENSE="geekbench"
-SLOT="5"
-
-RESTRICT="bindist mirror"
-
-S="${WORKDIR}/Geekbench-${PV}-Linux"
-
-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.0.ebuild b/app-benchmarks/geekbench/geekbench-5.4.0.ebuild
index 257bad69c379..87ca7c029dbb 100644
--- a/app-benchmarks/geekbench/geekbench-5.4.0.ebuild
+++ b/app-benchmarks/geekbench/geekbench-5.4.0.ebuild
@@ -7,7 +7,7 @@ DESCRIPTION="A Cross-Platform Benchmark for Android, iOS, Linux, MacOS and Windo
 HOMEPAGE="https://www.geekbench.com/"
 SRC_URI="https://cdn.geekbench.com/Geekbench-${PV}-Linux.tar.gz"
 
-KEYWORDS="-* ~amd64"
+KEYWORDS="-* amd64"
 LICENSE="geekbench"
 SLOT="5"
 
diff --git a/app-benchmarks/i7z/Manifest b/app-benchmarks/i7z/Manifest
index 933357ed2b84..b0e169fa22c6 100644
--- a/app-benchmarks/i7z/Manifest
+++ b/app-benchmarks/i7z/Manifest
@@ -10,5 +10,5 @@ AUX qt5.patch 365 BLAKE2B 4aa56d2b643ecc119122f549678d4cd1525bdba923067366c92fa0
 AUX typos.patch 1013 BLAKE2B d9549a3e20e22931dc59ad3b5460b2ca63111ccd5102f080673983d10aa67400e9e7e82f2dc9f7c127e23cf7e08f2f590e63d949bcf536783d70e994054f81f0 SHA512 8c738dab7c40cbfa258b4177bad0cf9fc52373370b17c23504086ac13b223b9c484f39722af1802dcbe4b036f742918275e245c000ced636bc281f00eca2f969
 AUX use_stdbool.patch 885 BLAKE2B 10365e67f43418213e8f38ab74d3588aab2783329d447834ad795f8973cdd53fdc40862d8f9abc723acaddfe03f49f3c471046ae865ed72f041db23ee1337c37 SHA512 5df3d042a580268971e6da0878bd070d2054e9a9732b518a88a489d6b3d62acae58f697fe44634ee6c847b108cae25df6592ed9e1f20ea4d7c6b36adb516830d
 DIST i7z-93_p20131012.tar.gz 879969 BLAKE2B 73b1f2e777cef9799fc9e11d366c989c37f4bad03676409855fdd8229a66d1075805068ad424ab0b46bb9bb4fe62431fb6c79b414fde0c1b1d29935ca4566839 SHA512 ef2dfc36407b18a2081413d423cc3d38c38121e386d9068eee9a794b810232727b3abbd22d3b36bc32206f4dc89dd881a4550df19108c439a91f01369bf74d5a
-EBUILD i7z-93_p20131012-r2.ebuild 1370 BLAKE2B 92870c287f04eeaa7549fcab1b613182fb0d3e5066486d8f01844ed673e01707ef2f8e6fd94e8bc7ca07a45c07333209d8a5413e2382e74a588310f66aed471d SHA512 753e682b123de2ad872619b2e2fffb9cb4e5753854ee0bbdc75c544d16620d1f3fe8c4300e0452c50cf2c9ca38eedc939d5a18f32b6edbddb558096d35fcacc9
+EBUILD i7z-93_p20131012-r2.ebuild 1375 BLAKE2B 3f194ad30fc1353236d9be0f6241aaafcb12ee8e74df20c42d0ebf1b2469fbd4b14ee48bfc93fde737693fa3b534780c1ef58d546234bc29316783bcaf39f4e3 SHA512 6b2f268f526e68d6dbf567a193f97c01024d68afb1b3d0480dc218c8f27e3fd9a563f5cc35d3f77ec26caaa8b086c253d787cfb4c88b5fdceb72ef5f2917e9b3
 MISC metadata.xml 296 BLAKE2B c58dcfad78dd439c5fb57ba43d2c7694eee04f21dd6feef0af39c06d4980c37a02da0a1cea423d41cc2d32265be75b731a1a3866cda1e855af8efd71917900fb SHA512 a73fd853e9d6da0d414da279e6fea520e9f1f1ff76c73295640be542ed81391871a83f30f5739271c7044692398182217e42b59d75fe65ad4c5d949015009668
diff --git a/app-benchmarks/i7z/i7z-93_p20131012-r2.ebuild b/app-benchmarks/i7z/i7z-93_p20131012-r2.ebuild
index c2e8656b7af9..def6449b2579 100644
--- a/app-benchmarks/i7z/i7z-93_p20131012-r2.ebuild
+++ b/app-benchmarks/i7z/i7z-93_p20131012-r2.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit flag-o-matic qmake-utils toolchain-funcs
+
+inherit qmake-utils toolchain-funcs
 
 COMMIT="5023138d7c35c4667c938b853e5ea89737334e92"
 DESCRIPTION="A better i7 (and now i3, i5) reporting tool for Linux"
@@ -22,7 +23,7 @@ RDEPEND="
 	)
 "
 DEPEND="${RDEPEND}"
-BDEPEND=""
+BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
 	"${FILESDIR}"/i7z-0.27.2-ncurses.patch
diff --git a/app-benchmarks/ioping/Manifest b/app-benchmarks/ioping/Manifest
index d25834fb49f4..7ebb8db7eb82 100644
--- a/app-benchmarks/ioping/Manifest
+++ b/app-benchmarks/ioping/Manifest
@@ -1,9 +1,4 @@
-AUX ioping-0.9-sysmacros.patch 711 BLAKE2B 4614c8aada443a0800d427dc0e8858e6120fc3d8496af5bf24744300b7b92d9765c97e605dd297afee1090695089bef8623f4639c917737b66b6c990e726dcbf SHA512 93f3a64610bff6970b9a9add9266766953aef1c2ec50afc683154617ddf7698cb72438ece6bfa08609fc5ca2d92b1291b75cca853ebf995b67c0279ea4420557
 AUX ioping-1.1-netdata.patch 4071 BLAKE2B c7dfca386a6e35d9d076eb0ce60e62e5b68d69cb02b69d1a0928da070454df15a50c1cd6c9dedf4a3fb559dac3749375b236905f089cd46894a5cb13dfdf4979 SHA512 3b8dae8089c4848b96402ccbf955fd6b28ad7eb772b7491c43f26dff8581a6143b86d20f193a73ba3d6eeea5d1c9bbb0c58ab6d5a60041ed9fc068207f522047
-DIST ioping-0.9.tar.gz 23695 BLAKE2B 41b37ad8dabd2c2e16f26798d878807c38e0d03bc4964a001f8800d0f398ba48335b1187e1f04cd235a980c5dce7e864c471fce8d46ca24a65f2022847eb8ebd SHA512 609e19c31a16a5961be0e468255f2853311162ad988d07404a8198042bec1e20cab37e192ad148536a0772efe8034a94d594671ec6fde7d37badee859796de1c
-DIST ioping-1.0.tar.gz 28824 BLAKE2B bb0f28e560419167450b27846650ff131c9cbb23c5df7f518afa8cea6a83bd97142d7ad8920b9ec86754deea0dcbf36af923223c78df6488f3623f2df852b59c SHA512 a6763ac800e98c819a74af80634ac723f413ffa183297918389e1e1f5fc83713b683d53b594f5bd20f11d168c21de5da9d42a215d78531ee8b619aff8b9b0b84
 DIST ioping-1.1.tar.gz 29251 BLAKE2B 2f0ec642c3545b8e603f90187f48bf44e1ef665a99bc04af4d5e6441016c9509875e8e05c1cc8715fd080c8a498c7374cf5db562a3203d7075edbe85683ccdbb SHA512 67802a6ab552ad1fdb8894f4d814601c2f66154f4bfc50fa0001d881694864c1a70882b4ba2d0f50cbd484472dc649a22b312f802a3bacc3317671971bdc0201
-EBUILD ioping-0.9.ebuild 801 BLAKE2B e5fdce3daf13efd4905b161a286a1ee1253672b6b575af59ae3b509d979d055db747468f1b47c9eb7d0c1f573b38f26f5041288306a3cd7a59b723ae1878d6fa SHA512 aad46a266d04e521c9acf838a29d1be022cc29cddd8870fb8ee1f0eb5d3f56952494c8445ba10b2de53a3464da3f370f9425c55ed3873c7cf27e4de9519ebcc0
-EBUILD ioping-1.0.ebuild 650 BLAKE2B 03bb6057f00478386ce4fd1b9deb9d76c731c2e021ce94a93e95622af84c55b909e84c055f37f5c0dac0ee65b9c4551b8ca690a0bb1874103943e307f36f80a5 SHA512 6ab0c17296583206b83d61a68fd071a22bcadbac23f0c5b0e6578aa268a532b56b5fd344284578c94e807f67bbd6a4a9d6b8126d8218a07f55893658cdf4b4bf
 EBUILD ioping-1.1.ebuild 626 BLAKE2B d73b3260c038cd61edb707d6fd54024db0620ee1750510b6c020b279f7b5dfbb647fbabbb5a3634fb34a4b5efe4a4e63e1a970c05e9cdd5e6a210c6096ac237b SHA512 5eba185c0b4bf6be4f7fc2499877ab025d886a0dca530cfac5b6e441cf7d9b744b88176b1740d8dc38be61ff5f591e6bd92acd2546f4354eb9b651c0b8e58925
 MISC metadata.xml 479 BLAKE2B 20009ac7e05778a61c18464c51b4e49de524463de99c4620e311e59483584e02566eb9578a78b287a31f856dd2c1bc8740d9e674dd64f259f18279bce4d0f04f SHA512 b03f0bdae0a21ee5144a163b4c1a1083a190dc198b8468fad9381e0928f5a91826702e2342ff6068e9e43db999c612204da5c236fde46b09c2b801f1ce0b3084
diff --git a/app-benchmarks/ioping/files/ioping-0.9-sysmacros.patch b/app-benchmarks/ioping/files/ioping-0.9-sysmacros.patch
deleted file mode 100644
index 837d395201b7..000000000000
--- a/app-benchmarks/ioping/files/ioping-0.9-sysmacros.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-https://bugs.gentoo.org/579982
-
-From c56a8a442e79a8837074e0e573f6319efa492ba8 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Tue, 19 Apr 2016 02:44:33 -0400
-Subject: [PATCH] ioping: include sys/sysmacros.h for makedev
-
-The makedev prototype is in sys/sysmacros.h, so include it.
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- ioping.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/ioping.c b/ioping.c
-index aae4704..80f4bb4 100644
---- a/ioping.c
-+++ b/ioping.c
-@@ -48,6 +48,7 @@
- #ifdef __linux__
- # include <sys/ioctl.h>
- # include <sys/mount.h>
-+# include <sys/sysmacros.h>
- # define HAVE_POSIX_FADVICE
- # define HAVE_POSIX_MEMALIGN
- # define HAVE_DIRECT_IO
--- 
-2.7.4
-
diff --git a/app-benchmarks/ioping/ioping-0.9.ebuild b/app-benchmarks/ioping/ioping-0.9.ebuild
deleted file mode 100644
index 29eae974e711..000000000000
--- a/app-benchmarks/ioping/ioping-0.9.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Simple disk I/0 latency measuring tool"
-HOMEPAGE="https://github.com/koct9i/ioping"
-SRC_URI="https://github.com/koct9i/ioping/releases/download/v${PV}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-PATCHES=( "${FILESDIR}"/${P}-sysmacros.patch )
-
-src_prepare() {
-	default
-	sed \
-		-e 's: -g : :g' \
-		-e 's: $(LDFLAGS) : :g' \
-		-e 's: -o : $(LDFLAGS) -o :g' \
-		-e 's:-s -m:-m:g' \
-		-e 's:LICENSE::g' \
-		-e 's:-O2.*::g' \
-		-i Makefile || die
-}
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		PREFIX="${EPREFIX}/usr"
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
-}
diff --git a/app-benchmarks/ioping/ioping-1.0.ebuild b/app-benchmarks/ioping/ioping-1.0.ebuild
deleted file mode 100644
index 3a9d7324601c..000000000000
--- a/app-benchmarks/ioping/ioping-1.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Simple disk I/0 latency measuring tool"
-HOMEPAGE="https://github.com/koct9i/ioping"
-SRC_URI="https://github.com/koct9i/ioping/archive/v1.0.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-src_prepare() {
-	default
-	sed \
-		-e 's:LICENSE::g' \
-		-i Makefile || die
-}
-
-src_compile() {
-	emake \
-		CFLAGS="${CFLAGS}" \
-		CC="$(tc-getCC)" \
-		PREFIX="${EPREFIX}/usr"
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
-}
diff --git a/app-benchmarks/libc-bench/Manifest b/app-benchmarks/libc-bench/Manifest
index 627ea5032b8d..8197e469a006 100644
--- a/app-benchmarks/libc-bench/Manifest
+++ b/app-benchmarks/libc-bench/Manifest
@@ -1,4 +1,4 @@
 AUX respect-flags.patch 528 BLAKE2B 89e202ce5cf9d3f7c25fa40333df2654c7546c068517367239fb8cbfe573bfa48ae9cdcad6fb98a721f5bef0349524277f6d11c83900d5947168492703cfb7dd SHA512 3f30d849ab7a52c0e16ea1e53e068d6761b782aab65cd47dfe6ba775257f858c2f4e3d3b1db920d45c8904b4973b45f013199adb93c1fb92e79c48bf7b89db09
 DIST libc-bench-20110206.tar.gz 3135 BLAKE2B f8c6b028e080695772f3275667dfc3ea6167eda47506dd32813a4942fc9f213317c0eafe6b08d1fd9a574301b74cf5ef1600cc4b12414245c6c85ca3b02e9013 SHA512 72f68616ab189f39f766c98afbb83bf3470a4e14ccb1dfe139a9006227262197546897da8f360bf48ba2c8854730aa385ca16270ec2e6cf2b531205550726f38
-EBUILD libc-bench-20110206.ebuild 601 BLAKE2B 27e0412fc45e98f47d2a462b13229e90a12b560867fed2f702ab954a415c6bebcbafd78243b9902bc671345dbb8a1b61aee449359e1d92478b529458d4594f86 SHA512 06acb3e505d2c9cd4375d31153d123e3015dd6376b1f9a815a0ea91ecfdbaf3f4b4fdb1ff2ac07c1cbfa3770637ca55f1699a84b11dc4149f1a486a9ff7dbf08
+EBUILD libc-bench-20110206.ebuild 587 BLAKE2B bfd954c7d03521f8ee27a675158fb69f21cff33be5f651e40c028375944d920639ff8a5ab695d97dc8fb1bf1c0ffa91a8651bbb0d01246189a6275ec2a1a29b6 SHA512 8c75f28e8d1ac55b17a602c5f6abff7c663fcfc2428f6d6712036047399fc1ba9ed9de34b67886cb3671c31b222ca67c222c230314090e5afd7c99dbc31dc5b0
 MISC metadata.xml 252 BLAKE2B f6282e2a99df668246ea8570c72345463f06d282b6adc6d9de2a08ef0827cf4572332c580caa594aad5ba8e200870d8d25494549ee4413798025f0d885b61a68 SHA512 cbda7bf9832872764ae776ce16b2966c37a2ba3a1982d9817006fd6b82d7b17146434cde428bf114062a483e9053d2acdcdd004695e6ebf428d19cdc09937c65
diff --git a/app-benchmarks/libc-bench/libc-bench-20110206.ebuild b/app-benchmarks/libc-bench/libc-bench-20110206.ebuild
index 72efbc992efa..75f49f8d8689 100644
--- a/app-benchmarks/libc-bench/libc-bench-20110206.ebuild
+++ b/app-benchmarks/libc-bench/libc-bench-20110206.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
-inherit eutils toolchain-funcs
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="Time and memory-efficiency tests of various C/POSIX standard library functions"
 HOMEPAGE="http://www.etalabs.net/libc-bench.html http://git.musl-libc.org/cgit/libc-bench/"
@@ -12,15 +12,15 @@ SRC_URI="http://www.etalabs.net/releases/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-src_prepare() {
-	epatch "${FILESDIR}"/respect-flags.patch
-}
+PATCHES=(
+	"${FILESDIR}"/respect-flags.patch
+)
 
 src_configure() {
 	tc-export CC
-	CFLAGS+=" ${CPPFLAGS}"
+
+	append-cflags "${CPPFLAGS}"
 }
 
 src_install() {
diff --git a/app-benchmarks/ramspeed/Manifest b/app-benchmarks/ramspeed/Manifest
index a1031c8e23de..d762285bcd90 100644
--- a/app-benchmarks/ramspeed/Manifest
+++ b/app-benchmarks/ramspeed/Manifest
@@ -1,3 +1,3 @@
 DIST ramsmp-3.5.0.tar.gz 79481 BLAKE2B 2bc3e12bf9e33c1a696743d8efa4a80ddcc2503dde2574a51a78d7f8927cbea08837be8a9ca0f9fc66865db5879785f86715afdc4c096aff326c9a462eab45c0 SHA512 175cd2e568e4efdb1225e3c5319950376c4834633dd618324cf4268c762213733ed67ea94b4e5835b0259483e88afd2e9d9a3fde63515b8b25e5ec0b51f16b0e
-EBUILD ramspeed-3.5.0-r2.ebuild 1342 BLAKE2B 8ab2c6749487869c22ea84f5e6136aab910ba3925a535cd9b90033446abb897d1ea6088d10df2b058d3628eabdd2b086b2a07e435d5ffb600d44ea2ba1121091 SHA512 ecb75043f0e599cfc9edafd5f305cb9a57cd2ea5874b37c9896356bba92a5ffb35c31c43e3c4bf6cd65a406055d8353eb129ec0ab647dc7933c97decc9f87954
+EBUILD ramspeed-3.5.0-r2.ebuild 1349 BLAKE2B 6cb6931f60672f7d69fff803fa1d3320266c079a0d009146ea097d4814e7eca5c595ca00c5d88cfb07e32dddba0b3b9a2ce877e0565ce603078a8bd4c327605d SHA512 638c48648541155a77a151c7abd3b3e3e4a7b788744586268e6012efd73f55d23cc1d46c5daf462ba4ea587b5858399796c7869d9e19900f64fc677a69a3916f
 MISC metadata.xml 272 BLAKE2B 00654bf98bfecb8cae8d9ceb6b05da17f5dc2aa7ebc11bcb5fb144372ddb37283d867c232ea19a7d5b72714c678f392ade3a17d16d8067e10ddb546990bb4dd1 SHA512 04479b0e225e0ee99ae1915b131f1d85bd455f324fbc902073e4365feb79164d3b64b4bc02d105ef78bc9553fdd9617a8b96709272ac9abb142d85de568e856d
diff --git a/app-benchmarks/ramspeed/ramspeed-3.5.0-r2.ebuild b/app-benchmarks/ramspeed/ramspeed-3.5.0-r2.ebuild
index 01310ac9a2f3..049935400795 100644
--- a/app-benchmarks/ramspeed/ramspeed-3.5.0-r2.ebuild
+++ b/app-benchmarks/ramspeed/ramspeed-3.5.0-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit flag-o-matic toolchain-funcs
 
@@ -11,14 +11,13 @@ MY_P="${MY_PN}-${PV}"
 DESCRIPTION="Benchmarking for memory and cache"
 HOMEPAGE="http://www.alasir.com/software/ramspeed/"
 SRC_URI="http://www.alasir.com/software/${PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="Alasir"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="cpu_flags_x86_sse pic"
 
-S="${WORKDIR}/${MY_P}"
-
 src_configure() {
 	local obj
 	local arch_prefix=./
@@ -28,7 +27,7 @@ src_configure() {
 
 	tc-export CC AS
 
-	#fix the stack
+	# Fix the stack
 	append-ldflags -Wl,-z,noexecstack
 	obj=( ramsmp.o ${arch_prefix}{fltmark,fltmem,intmark,intmem}.o )
 
@@ -50,7 +49,7 @@ src_configure() {
 		obj+=( ${arch_prefix}{mmxmark,mmxmem,ssemark,ssemem}.o )
 	fi
 
-	echo "ramsmp: ${obj[@]}" > Makefile
+	echo "ramsmp: ${obj[@]}" > Makefile || die
 }
 
 src_install() {
diff --git a/app-benchmarks/siege/Manifest b/app-benchmarks/siege/Manifest
index 336c7454b49a..9126a82f07e1 100644
--- a/app-benchmarks/siege/Manifest
+++ b/app-benchmarks/siege/Manifest
@@ -1,6 +1,8 @@
 AUX siege.bash-completion 659 BLAKE2B 7d9ce4e253a3a95af6a008fb81a421b46139fef2cced8174a65e09f6196fb4fa50128199d462ee62f17c7c8c55e20aabafca1edec2d3ca7edb508dd5e8ac63ed SHA512 26a4f55ac8d57231d9cc137ac8243da4cc33a3efb6b5366891230087c3e4d7555bcf8c20a7608479142589254a8c049f3165807ecf9c0eba0eb72422e04279e8
 DIST siege-4.0.7.tar.gz 525654 BLAKE2B b97c7309d33387d15327dc39ae115bebdfe64fa0debea2da87590ce801d2f590622392ea1ecc6be9f2973ff9b37dfc0f5f0fef232a4593410c4503db6c78771f SHA512 2dcccc50a2d8cd0d6c18efe776b871b999f6918c078898845fec34bb2b1b8ec03e0b95792dd963aaefb054e4f4e27f604ed95c0de5f8a34cbf738f66a2307abc
 DIST siege-4.0.8.tar.gz 525619 BLAKE2B 4c0b570810c4c1f3f13374aa1f33dc1624f989096280fd672a2c3deee7827099d790215e2583670fa58862df35b4db8998cf57c3c864354e8bd8aa8093c66724 SHA512 34239d761c1fff2a6048b59a98b64e87da065257ca4d62eb899f600573d920f5503bbdad8f5c5d31b4052c64857394c7899a9bda5384c00be8652ce4c98845ca
+DIST siege-4.0.9.tar.gz 525804 BLAKE2B d857df05f40a0ac26a8abdd54e7de374125dde4c114bd1ac3ddd9e9856a30d4fdfefd325980717e59b5876df99a87f971c5b3f91d6478f9638f1860557615169 SHA512 6208b7924162be4dd7ea8cdc297930d28e8a1cb125cf26e8707c2cb67efad741cd090c12081ea80837314d4b5703da152a97b0e8fbf4c64ff64c6714eb4b5fc7
 EBUILD siege-4.0.7.ebuild 1279 BLAKE2B 20c50d6ce94ab0ecaa8f17252206c021dd986797f607851cb7377b40a906e671636d4768049a1fb4781a6ca4ce6c47c41da50601070d0d986b039e23c35c353f SHA512 2b1f0a85963f39a1b972627d3c1873db513e1bb7da99dad36cbaca994d57b1f07a7ea91e3f14b3752925754278f1f92889a15a1984016ebe16c889c1f0fb48d7
-EBUILD siege-4.0.8.ebuild 1282 BLAKE2B e90fbda64fe3a679ffb870245a1fd460892b878b1459701f101741ec5ef64435eaaf3217837d4d5d305a5ea21ea31cf31dec4307e7b23deddddd903adec1b38e SHA512 f77ded5a9f0c59a9a33db4a0002334cf6ba2e403677d95812e6e1b7347eacbecb2aadbc262c1a56499eda057be4777dc712f7a1a14ea2d654a6fe928f9cdfb0b
+EBUILD siege-4.0.8.ebuild 1279 BLAKE2B 92839e839861534d87b0caa57019b523958036e0fe5e756bc6a006cf19015372981b37b036f8f39e87f420eec224fde6f86094171e57a9a80416dbc0166d23e2 SHA512 3dbbbca663341020e4fd12d7b56048f15322510ec1e19f98668fe67d4b8b834e62bcf63f0e429a15e9baed9d843c0302fa76cba286adc5aac43c0d43dac5c317
+EBUILD siege-4.0.9.ebuild 1222 BLAKE2B 124cc03e0c5ea1e8961601382899f53ef883fdd540582cf107302135de67ba5a380cc8360a05fad23406e045ad6276dd6b1d6fcda5451b8d2a469fbe61c8168d SHA512 0e1a7e8d1d197764e5cfbafe1c30040a4bd3cc1410513d1946985caeb42e7be21df5fe95a4a6fcd04b3f95f18e36c51ba01b4d4bba21fc382c28a64b7e93cd93
 MISC metadata.xml 855 BLAKE2B 4dfaca82343517227a9fe3f2507863665e5d966bead652ce7700a2a2aa86363750df02e6fb1dfa2ca86d781cca3cb02611325c6def60461692cb2213d5c78d65 SHA512 09a8da39fde59f4eb9e93d39c7e2dc3414e6bc24d0b4c24e7bcef5878f5987221ab7fc3e7285dbbf1be619ab1663a1aabd267ef00bfea9c4b3addd52473a0679
diff --git a/app-benchmarks/siege/siege-4.0.8.ebuild b/app-benchmarks/siege/siege-4.0.8.ebuild
index 3b1feaf8f88a..294132c28c6b 100644
--- a/app-benchmarks/siege/siege-4.0.8.ebuild
+++ b/app-benchmarks/siege/siege-4.0.8.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.joedog.org/siege-home https://github.com/JoeDog/siege"
 SRC_URI="http://download.joedog.org/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
-KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~x86 ~x64-macos"
+KEYWORDS="amd64 ~arm ~hppa ~mips ppc x86 ~x64-macos"
 SLOT="0"
 IUSE="libressl ssl"
 
diff --git a/app-benchmarks/siege/siege-4.0.9.ebuild b/app-benchmarks/siege/siege-4.0.9.ebuild
new file mode 100644
index 000000000000..222a5bf1384f
--- /dev/null
+++ b/app-benchmarks/siege/siege-4.0.9.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools bash-completion-r1
+
+DESCRIPTION="A HTTP regression testing and benchmarking utility"
+HOMEPAGE="https://www.joedog.org/siege-home https://github.com/JoeDog/siege"
+SRC_URI="http://download.joedog.org/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~x86 ~x64-macos"
+SLOT="0"
+
+IUSE="ssl"
+
+RDEPEND="ssl? ( dev-libs/openssl:0= )"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	# bundled macros break recent libtool
+	# remove /usr/lib from LDFLAGS, bug #732886
+	sed -i \
+		-e '/AC_PROG_SHELL/d' \
+		-e 's/SSL_LDFLAGS="-L.*lib"/SSL_LDFLAGS=""/g' \
+		-e 's/Z_LDFLAGS="-L.*lib"/Z_LDFLAGS=""/g' \
+		configure.ac || die
+	rm *.m4 || die "failed to remove bundled macros"
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		$(use_with ssl ssl "${EPREFIX}/usr")
+	)
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${ED}" install
+
+	dodoc AUTHORS ChangeLog INSTALL README* doc/siegerc doc/urls.txt
+
+	newbashcomp "${FILESDIR}"/${PN}.bash-completion ${PN}
+}
+
+pkg_postinst() {
+	elog "An example ~/.siegerc file has been installed in"
+	elog "${EPREFIX}/usr/share/doc/${PF}/"
+}
diff --git a/app-benchmarks/stress-ng/Manifest b/app-benchmarks/stress-ng/Manifest
index aac573d9e631..797a9da7b288 100644
--- a/app-benchmarks/stress-ng/Manifest
+++ b/app-benchmarks/stress-ng/Manifest
@@ -1,3 +1,3 @@
-DIST stress-ng-0.12.06.tar.xz 530940 BLAKE2B dcf1c97df38cdfd15c88fa71497477d83a0ab8e18ca506717f360b8a1f284be00163f6de956d686cdd6d479bd6fb2075ec2dc4dea55b4af4c623caf4a412e7a0 SHA512 bdfbee6c1d339dc4d288aa28b08bdaf158f49bb023b527c653e7956d80607690fe4aab763acc8c6659e822f2e225ee2be39ff60effa972b05c4c5e0fe067d6fc
-EBUILD stress-ng-0.12.06.ebuild 975 BLAKE2B 0eb53df04bdcba13dfd0094cec49b5b7810f57120c2be614e91e9ef9757ecd4cd38c6d7a14bd42359c15693fe50794cbddd679be34cdffc5e4a7d4b0261f3b20 SHA512 9270479a8843a12a58055b276582028a9eb79036365dcfee833536e522aac3ecc287dd8bba88fcab86a56ce9ac0fa0fa355fc21c3811d0060c92bd1ba6f215f7
+DIST stress-ng-0.12.07.tar.xz 536376 BLAKE2B 669f97ad6534d5541e67b6252ac2df0e7ed13e51ba50e71ae73840f5cd2fba59f050a4b1344e98ab0b8263f548aed32b6d1c1829de916093d8ab354e29033e14 SHA512 64b6f583a8564e92abb5e45cbe0ed2d5222d518192057fe9bde5bc11aaa322ade35c5c7190ea4ecc3f7cb51820c92815c248b856856a56609a3834e10da90592
+EBUILD stress-ng-0.12.07.ebuild 841 BLAKE2B c876ae27fcb930de6ed99329efc19819eeabc6b0b42496236f6fbbea2e84af26ff92a94d85e8ac309f1d2cdb73318d25e4511668232fe378180a684a654a311f SHA512 fe86cc998ed55de0dc61ef386e09baa24c9434fed5a8f284e17fe2a152ea936bc9f2ddb678332cfb043b2048a00d04d7eb687e522f2e285c5543308cd51f43b1
 MISC metadata.xml 834 BLAKE2B 01f0258893808f35495d063d634b3fecbb47e94cc6915ea605eedd6565e860bd42cbf181afa25e6e2faba396aa4c6da5d4e489af40bf5b11bd2ebb4e363e6994 SHA512 17c422c00bae52d5305ec4c34452c2bf86f280f2fcfa8c26710356023115828092d1d6f321e8ee194801b2d31413e07416041632ef692ad4128f8f99e389efb1
diff --git a/app-benchmarks/stress-ng/stress-ng-0.12.06.ebuild b/app-benchmarks/stress-ng/stress-ng-0.12.07.ebuild
index 073bfbc1f4a8..670270f6cecb 100644
--- a/app-benchmarks/stress-ng/stress-ng-0.12.06.ebuild
+++ b/app-benchmarks/stress-ng/stress-ng-0.12.07.ebuild
@@ -27,15 +27,8 @@ RDEPEND="${DEPEND}"
 
 DOCS=( "README" "README.Android" "TODO" "syscalls.txt" )
 
-src_prepare() {
-	default
-
-	# Don't install compressed man page.
-	# Respect users CFLAGS.
-	sed -e 's/stress-ng.1.gz/stress-ng.1/' -e 's/-O2//' -i Makefile
-}
-
 src_compile() {
+	export MAN_COMPRESS=0
 	export VERBOSE=1
 	tc-export CC