gentoo resync : 17.02.2021

4 files changed, 3 insertions, 53 deletions

diff --git a/app-benchmarks/Manifest.gz b/app-benchmarks/Manifest.gz
index e780eed3f3a6..70986b393988 100644
--- a/app-benchmarks/Manifest.gz
+++ b/app-benchmarks/Manifest.gz
diff --git a/app-benchmarks/stress-ng/Manifest b/app-benchmarks/stress-ng/Manifest
index f12f237f9cf9..5886c1eb5f81 100644
--- a/app-benchmarks/stress-ng/Manifest
+++ b/app-benchmarks/stress-ng/Manifest
@@ -1,5 +1,4 @@
 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 927 BLAKE2B 355253671e62476f7b441c2807d993f2df7fd405082bceab690e7c82bf953642aabe999eebb1533560983c489627a4ca3d07e7161043fc05700ea8884290b433 SHA512 b379efcc8264839c9c3844d8891fbcac584baa819143e7db6797d07faa9f7976fa674031d96f3b49f3f30cdfb237b6e6489e74e2b16ca2fd6ca7418d1d04627a
+DIST stress-ng-0.12.03.tar.xz 525156 BLAKE2B 76b56f01670e553acef9caef3c9aea5fb2a0594d9a26694de9aff8d3243494269c82af6d0259cb759dc4763f3faae28f1f06ce797ec07c08a2b8a9516caf7365 SHA512 372de29089645fe80d4b9c17779b7dd0f724d910c898cb181791476e64906cf7713b0cc78d33bb9d4485b02928122590d76f3af731e24923f6b26ce65f862114
+EBUILD stress-ng-0.12.03.ebuild 856 BLAKE2B c7d3eed51df12a6666b25ea973bef5a4d81e52e152c875e553891c18ba23fd76a87372b3e9e8e37e61ca676c0e1e42e72b28623b5016f851b3186f627b5e16f8 SHA512 229e156332d957b8ebf8c8f9e89fb6a976de1ed76fcdb4f68e1560286ad9d225a33f60e8ee4bd6fd4a56c8ae98fb92c97665425958c4f6eff2d9f49e72c46f90
 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
deleted file mode 100644
index 14498b494499..000000000000
--- a/app-benchmarks/stress-ng/files/stress-ng-0.12.02-fix-build-breaking-HAVE_USTAT-typo.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-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.03.ebuild
index ec872d653bdc..01aaca45b7b8 100644
--- a/app-benchmarks/stress-ng/stress-ng-0.12.02.ebuild
+++ b/app-benchmarks/stress-ng/stress-ng-0.12.03.ebuild
@@ -27,10 +27,7 @@ RDEPEND="${DEPEND}"
 
 DOCS=( "README" "README.Android" "TODO" "syscalls.txt" )
 
-PATCHES=(
-	"${FILESDIR}/${PN}-0.11.23-makefile.patch"
-	"${FILESDIR}/${PN}-0.12.02-fix-build-breaking-HAVE_USTAT-typo.patch"
-)
+PATCHES=( "${FILESDIR}/${PN}-0.11.23-makefile.patch" )
 
 src_compile() {
 	tc-export CC