gentoo (valentine's day) resync : 14.02.2021

13 files changed, 103 insertions, 90 deletions

diff --git a/app-benchmarks/Manifest.gz b/app-benchmarks/Manifest.gz
index d58a2ba536b8..e780eed3f3a6 100644
--- a/app-benchmarks/Manifest.gz
+++ b/app-benchmarks/Manifest.gz
diff --git a/app-benchmarks/acovea/Manifest b/app-benchmarks/acovea/Manifest
index a1f7eb3b6bb0..77418362f149 100644
--- a/app-benchmarks/acovea/Manifest
+++ b/app-benchmarks/acovea/Manifest
@@ -5,5 +5,5 @@ AUX acovea-5.1.1-glibc-212.patch 235 BLAKE2B 13be0d214c3f0c287a560bb240efc47874b
 AUX acovea-5.1.1-libevocosm.patch 3531 BLAKE2B 1a221c1abd7499384f5ef087c4e3efa8df510bdce15c32a5b1a70420b5acb7987780dcc4db6cba9cf6609a8f91397845071ba45797c81f4911f33b79acc4d403 SHA512 41704c855fdbdef96dc7eae1f196fde895412a95a248627cbf4e99ccf28519f3725edde17d443fa92ae0f5a301b95c4d8e2255d4a48deb14d4e5a59e902cbe1f
 AUX acovea-5.1.1-underlinking.patch 327 BLAKE2B 3b611c70d306cce314baf45622e4a395fa48f0a29d663198098f8446a575176e852b878615fd5abd3460e660c25f8549492cfb0c2e6c60ed20fb6915082a18f3 SHA512 cc185181899cef9a6e1b830663a179b61170a47cbc1568ee6fd71756cee3ccc605a4568528384b9b24a7b7b4758e70f5bcf523d4ea044b31667bb024293eb883
 DIST libacovea-5.1.1.tar.gz 363048 BLAKE2B 61f894e99f3678f3b676e0926ff6d7a6bd376a654ad109d5b7f676d7053e4b975d90e0ac01d820b8498a6992db1cbd2fb5443fbe3871ef3f86bee280fd808352 SHA512 47ac88d713004ccdbf31c29bd5ead3e9d869eee262f2c12e12bf9aa7ec177d2c1e175908704cd5463b314752692edcd98d69408dbeb5873caff1745535a3a365
-EBUILD acovea-5.1.1-r2.ebuild 924 BLAKE2B 770d72ef6cfd95f1b4c344649e3538a5409eb5b637a5cc81013a4d2f2747ead9abccbd1cee4582533b2371d69d6f8fda56a959ba4a40135ca0504d28aa4c1b39 SHA512 f2c6cfb365cca5155435b901daf0408a7264f1f999401aa93db546959b25a160026d7ed43e1896d48cac789c9acf1dd59235a3c62f39c44894a8d646b11079e8
+EBUILD acovea-5.1.1-r2.ebuild 888 BLAKE2B adea00e0c4f5496605d3ebeac66fcdce7a8d597c45aee3a2f7fc890c5bdf2a8c77d2e26c4fa2772a2617d37b51675f2cd27162ba97812bda080e1cbe77af05ce SHA512 5c231085144a4e9c7cc903f81e257aac54934a498dbdf33feb1b50a87645993e2e75b4f597af6978ae45781240099a8d5ca485faf2b183504c7f33dee2554aec
 MISC metadata.xml 247 BLAKE2B 5a20af3c9732ef7dba68131a08988652f5c93a6d186a82c4deb1bb9c06dc3ae73152a0d241cc346637f7b11caf4676da43301ba596c67b66669535e71db0b03e SHA512 29cf52c16b0cce69899d9c2da8acd9144b7d760442aa323b854dceadb42459e009545193b1df7911ac2241b59f4819b4a6bb1d206d6f57953f770031433bb6b7
diff --git a/app-benchmarks/acovea/acovea-5.1.1-r2.ebuild b/app-benchmarks/acovea/acovea-5.1.1-r2.ebuild
index 6d3ae2f60f1c..d00773301c07 100644
--- a/app-benchmarks/acovea/acovea-5.1.1-r2.ebuild
+++ b/app-benchmarks/acovea/acovea-5.1.1-r2.ebuild
@@ -1,18 +1,18 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit autotools
 
 DESCRIPTION="Analysis of Compiler Options via Evolutionary Algorithm"
 HOMEPAGE="http://www.coyotegulch.com/products/acovea/"
 SRC_URI="http://www.coyotegulch.com/distfiles/lib${P}.tar.gz"
+S="${WORKDIR}/lib${P}"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
-IUSE="static-libs"
 
 RDEPEND="
 	>=dev-libs/libcoyotl-3.1.0:=
@@ -20,8 +20,6 @@ RDEPEND="
 	dev-libs/expat:="
 DEPEND="${RDEPEND}"
 
-S=${WORKDIR}/lib${P}
-
 PATCHES=(
 	"${FILESDIR}"/${P}-asneeded.patch
 	"${FILESDIR}"/${P}-free-fix.patch
@@ -37,11 +35,11 @@ src_prepare() {
 }
 
 src_configure() {
-	econf $(use_enable static-libs static)
+	econf --disable-static
 }
 
 src_install() {
 	default
 
-	find "${D}" -name '*.la' -delete || die
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/app-benchmarks/contest/Manifest b/app-benchmarks/contest/Manifest
deleted file mode 100644
index dcb9938ba2b1..000000000000
--- a/app-benchmarks/contest/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX contest-0.61-fix-buildsystem.patch 581 BLAKE2B 9a11fb9b24a674a7bea0c40b9100fa3813954b853cd133cf69b90b0a3381a20ef289793939834c777140709082b262715990900af16c422442fc2215be2922f2 SHA512 35abe08432d62020a1c9daa2c9bae18dd2d8db99d3f938f9eb423d89b30c9d67441922bef5376c9e4b5be1744fb62b6e7c0163033f006225638f95c097f484a3
-AUX contest-fortify_sources.patch 376 BLAKE2B fb2ca7869fc19304c14aa2e52e0d3986f2021703800f547af5f88b866978a016e82b2e2911192465d7836bbbc297ab25f7d7d3499759ee9ff915ee28a2e0e089 SHA512 71bb1d0b594bfa2342622c5495ea0306829ced109fd606bdfb5e1aecc17b11270235f83606961067819097863ba3bff66e5c37c5496028ccce3f1701ee9bdb2f
-DIST contest-0.61.tar.bz2 29204 BLAKE2B 76e19365026b63f4a37c45905769f28c921455cb4020666898efa332d88627d85e5044f385556f07325537b6b4f80079b301fd9915f068754dd80d815092ff86 SHA512 34fb83a3b37d67d9729ce14fdd066010c7360a401d21f3566be8dae7271a30f01cc5b84092405ddfb6961a2284af0a18ce6709ab6d4ab68607aa98f975815131
-EBUILD contest-0.61-r1.ebuild 748 BLAKE2B 381d04337604a40818acdf923dc9303dbd77c04099b1a798744e19ddbffc9bde50c7676be5e73c2a08c4b21fc55cc8eb5a3f19b15aba3adef8fcc09bc6176662 SHA512 0eee6b57d027845e57afb4535ef91c233652803c91f7f0830ef4573b48f95526e403f13627e442419f42232aceebd3be2125e5cb1382529f15e6b883b6266543
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-benchmarks/contest/contest-0.61-r1.ebuild b/app-benchmarks/contest/contest-0.61-r1.ebuild
deleted file mode 100644
index f5671af63d0d..000000000000
--- a/app-benchmarks/contest/contest-0.61-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="Test system responsiveness to compare different kernels"
-HOMEPAGE="http://users.tpg.com.au/ckolivas/contest/"
-SRC_URI="http://www.tux.org/pub/kernel/people/ck/apps/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-
-RDEPEND=">=app-benchmarks/dbench-2.0"
-PATCHES=(
-	"${FILESDIR}/${PN}-fortify_sources.patch"
-	"${FILESDIR}/${P}-fix-buildsystem.patch"
-)
-
-src_prepare() {
-	# fix #570250 by restoring pre-GCC5 inline semantics
-	append-cflags -std=gnu89
-
-	default
-	tc-export CC
-}
-src_compile() {
-	emake
-}
-
-src_install() {
-	dobin contest
-	doman contest.1
-	dodoc README
-}
diff --git a/app-benchmarks/contest/files/contest-0.61-fix-buildsystem.patch b/app-benchmarks/contest/files/contest-0.61-fix-buildsystem.patch
deleted file mode 100644
index 7e8c6b7eb6a2..000000000000
--- a/app-benchmarks/contest/files/contest-0.61-fix-buildsystem.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- contest-0.61/Makefile
-+++ contest-0.61/Makefile
-@@ -1,8 +1,8 @@
- INSTPATH=/usr
- BIN=$(INSTPATH)/bin
- MAN=$(INSTPATH)/man
--CC=gcc
--CFLAGS= -W -Wall -Wpointer-arith -Wmissing-prototypes -Wmissing-declarations \
-+CC?=gcc
-+CFLAGS?= -W -Wall -Wpointer-arith -Wmissing-prototypes -Wmissing-declarations \
- 	-g -O2
- 
- ifeq ($(shell uname),FreeBSD)
-@@ -14,7 +14,7 @@
-      list_load.o
- 
- contest: $(objs)
--	$(CC) $(CFLAGS) -o $@ $(objs) $(KVM)
-+	$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(objs) $(KVM)
- contest.1.gz: contest.1
- 	gzip -c contest.1 > contest.1.gz
- install: contest contest.1.gz
diff --git a/app-benchmarks/contest/files/contest-fortify_sources.patch b/app-benchmarks/contest/files/contest-fortify_sources.patch
deleted file mode 100644
index 042065822612..000000000000
--- a/app-benchmarks/contest/files/contest-fortify_sources.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- contest-0.61/bmark.c	2009-02-27 23:13:44.000000000 +0000
-+++ contest-0.61/bmark.c	2009-02-27 23:12:44.000000000 +0000
-@@ -47,7 +47,7 @@
- 	}
- 	/* child */
- 
--	if((tmpfd=open(TMP_FILE, O_RDWR|O_CREAT|O_TRUNC))==-1){
-+	if((tmpfd=open(TMP_FILE, O_RDWR|O_CREAT|O_TRUNC, S_IRUSR|S_IWUSR))==-1){
- 		printsys("Could not open temporary file\n");
- 	}
- 	if(dup2(tmpfd, TMP_FD)==-1){
diff --git a/app-benchmarks/contest/metadata.xml b/app-benchmarks/contest/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-benchmarks/contest/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-benchmarks/geekbench/Manifest b/app-benchmarks/geekbench/Manifest
index e89d1eee7f81..e2f25756fc86 100644
--- a/app-benchmarks/geekbench/Manifest
+++ b/app-benchmarks/geekbench/Manifest
@@ -3,9 +3,11 @@ DIST Geekbench-2.4.3-Linux.tar.gz 3337551 BLAKE2B cb660f3c08cc812cb23374032490a1
 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.1-Linux.tar.gz 93054604 BLAKE2B bf8c2ecb0eeed5c74868499a1bf0cd248b5d8a92888c5df37f674d98e79af4ba636971fe1007edc368a463ce391d273b79ea33cbfa2ed8564a751962e928d2fc SHA512 14f8112b9e76dee726074863dc321b63956804b2666d42835cb863b9c61548168b9cb80f2e45a64695706c77afc91e792e874b4451b7b503f18b194804c16bdf
+DIST Geekbench-5.3.2-Linux.tar.gz 93056596 BLAKE2B 400bb854956fa74f0f3399b3d4d98f63e9c1e28890001cde55a2aa441cdf2d2aa2e7ede6565bad3defdbaf29913bde66f06a9b341134ccffc434021665a84a89 SHA512 03225a4837c02745723f0d5f65439c20977bd16243c1ee2ab6d1540828b54778de93c82ca5688b3bfefe0dea4e41fda43fdda633a9b1685382fd549742d580a9
 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.1.ebuild 1030 BLAKE2B 942a330df0da458054979c0137d63a06ffd94aaa139a29c5cf291438cc64f7b1563df1d66ecf3e6d3779c860ea060f84efb66daf48871d22f51d798d43c12f10 SHA512 8885a9815bf0788ca460fe8f063c68fb215c0d8888649a49c05d0331182d98f05ae82cff35efec13366a2bb07a480d08fb578d17e01d6fc04b304db7c9d9ebbf
+EBUILD geekbench-5.3.2.ebuild 1031 BLAKE2B 25532425376ee29508a8aa262c0b2f914226a5949a8e47bd03b937c3464c1c034dc28d9e7c7cdc3bf100799f9f402d78209f5ffa80bccb23cbb229c6a13c578f SHA512 0999f6362bcae62a6e8d50ac7a8427f69717a5ac7ed5d85b23c70854af4dcfb24ed92656f0483b919e9303a31afa752396b7c9c8779048241d6f31e49429affa
 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
new file mode 100644
index 000000000000..257bad69c379
--- /dev/null
+++ b/app-benchmarks/geekbench/geekbench-5.3.2.ebuild
@@ -0,0 +1,43 @@
+# 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/stress-ng/Manifest b/app-benchmarks/stress-ng/Manifest
index 161251678197..f12f237f9cf9 100644
--- a/app-benchmarks/stress-ng/Manifest
+++ b/app-benchmarks/stress-ng/Manifest
@@ -1,4 +1,5 @@
 AUX stress-ng-0.11.23-makefile.patch 1635 BLAKE2B 6fd6b90ea16080d5f131724dd9f7128c712e7d6e912d2c8d420fa5c4ff6840e5fffddc18db4977133b0f36f34c5f67e35f106adaef685c0b428d97d37c0e3291 SHA512 15f28bf02fb36e08bdef49b75e413577d226d2e3287560f19c3ce9bb807b3923d7832166156627f5557ca0a1e8e67b9a42177042ad9f1909ec5364e72544d3d3
+AUX stress-ng-0.12.02-fix-build-breaking-HAVE_USTAT-typo.patch 1211 BLAKE2B d7732f41a7292c4c142d2f1affd93d1fbce551fad69d950b5e89bba62327a73eb22ca5d1f8c0c0dc8388dbbd9c840841b484d99338d520a4279d37080ebd2f79 SHA512 2d6d5f4505166ef231fc241515a86bc8bd9984f680c749d9644cbc09dd64e2dd2fefb8f255362cb49fed360792d790ea3db1fed0334384fbf4021e6478cc5837
 DIST stress-ng-0.12.02.tar.xz 519476 BLAKE2B a56f5e186083fdd2675a13c8ed0e128cb30f0c16787f24dff5db484dbf318d00fe2d9887947b54122e83e8aee3c203c2c8fda4adf6c7c28d0e68b357acb58641 SHA512 074baa898cce4dad898e628e86d7cf29eeef4226bdceddd7e3b05a68327f8fa98df5875434599985049e280f649d2df9a2e0fa7ff32482a800a9fb0ff0c91b7c
-EBUILD stress-ng-0.12.02.ebuild 856 BLAKE2B c7d3eed51df12a6666b25ea973bef5a4d81e52e152c875e553891c18ba23fd76a87372b3e9e8e37e61ca676c0e1e42e72b28623b5016f851b3186f627b5e16f8 SHA512 229e156332d957b8ebf8c8f9e89fb6a976de1ed76fcdb4f68e1560286ad9d225a33f60e8ee4bd6fd4a56c8ae98fb92c97665425958c4f6eff2d9f49e72c46f90
+EBUILD stress-ng-0.12.02.ebuild 927 BLAKE2B 355253671e62476f7b441c2807d993f2df7fd405082bceab690e7c82bf953642aabe999eebb1533560983c489627a4ca3d07e7161043fc05700ea8884290b433 SHA512 b379efcc8264839c9c3844d8891fbcac584baa819143e7db6797d07faa9f7976fa674031d96f3b49f3f30cdfb237b6e6489e74e2b16ca2fd6ca7418d1d04627a
 MISC metadata.xml 834 BLAKE2B 01f0258893808f35495d063d634b3fecbb47e94cc6915ea605eedd6565e860bd42cbf181afa25e6e2faba396aa4c6da5d4e489af40bf5b11bd2ebb4e363e6994 SHA512 17c422c00bae52d5305ec4c34452c2bf86f280f2fcfa8c26710356023115828092d1d6f321e8ee194801b2d31413e07416041632ef692ad4128f8f99e389efb1
diff --git a/app-benchmarks/stress-ng/files/stress-ng-0.12.02-fix-build-breaking-HAVE_USTAT-typo.patch b/app-benchmarks/stress-ng/files/stress-ng-0.12.02-fix-build-breaking-HAVE_USTAT-typo.patch
new file mode 100644
index 000000000000..14498b494499
--- /dev/null
+++ b/app-benchmarks/stress-ng/files/stress-ng-0.12.02-fix-build-breaking-HAVE_USTAT-typo.patch
@@ -0,0 +1,46 @@
+From ce1fb7978c836281dd91558f2b4ab3ecee0c253c Mon Sep 17 00:00:00 2001
+From: Adrian Ratiu <adrian.ratiu@collabora.com>
+Date: Wed, 10 Feb 2021 14:28:00 +0200
+Subject: [PATCH] stress-ng.h: fix build-breaking HAVE_USTAT typo
+
+This minor typo fails builds on newer glibc because ustat.h does
+not exist anymore.
+
+Signed-off-by: Adrian Ratiu <adrian.ratiu@collabora.com>
+---
+Backported from stress-ng master commit ce1fb7978c836281d.
+---
+ core-shim.c | 3 ++-
+ stress-ng.h | 2 +-
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/core-shim.c b/core-shim.c
+index e4e6189d..8af7bcc5 100644
+--- a/core-shim.c
++++ b/core-shim.c
+@@ -1390,7 +1390,8 @@ int sys_clone3(struct shim_clone_args *cl_args, size_t size)
+ 
+ int shim_ustat(dev_t dev, struct shim_ustat *ubuf)
+ {
+-#if defined(HAVE_USTAT)
++#if defined(HAVE_USTAT) &&	\
++     defined(HAVE_USTAT_H)
+ 	return ustat(dev, (void *)ubuf);
+ #elif defined(__NR_ustat)
+ 	return syscall(__NR_ustat, dev, ubuf);
+diff --git a/stress-ng.h b/stress-ng.h
+index e16a08f0..9d964059 100644
+--- a/stress-ng.h
++++ b/stress-ng.h
+@@ -219,7 +219,7 @@
+ #include <ucontext.h>
+ #endif
+ 
+-#if defined(HAVE_USTAT)
++#if defined(HAVE_USTAT_H)
+ #include <ustat.h>
+ #endif
+ 
+-- 
+2.30.0
+
diff --git a/app-benchmarks/stress-ng/stress-ng-0.12.02.ebuild b/app-benchmarks/stress-ng/stress-ng-0.12.02.ebuild
index 01aaca45b7b8..ec872d653bdc 100644
--- a/app-benchmarks/stress-ng/stress-ng-0.12.02.ebuild
+++ b/app-benchmarks/stress-ng/stress-ng-0.12.02.ebuild
@@ -27,7 +27,10 @@ RDEPEND="${DEPEND}"
 
 DOCS=( "README" "README.Android" "TODO" "syscalls.txt" )
 
-PATCHES=( "${FILESDIR}/${PN}-0.11.23-makefile.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-0.11.23-makefile.patch"
+	"${FILESDIR}/${PN}-0.12.02-fix-build-breaking-HAVE_USTAT-typo.patch"
+)
 
 src_compile() {
 	tc-export CC