gentoo resync : 29.06.2021

6 files changed, 8 insertions, 56 deletions

diff --git a/app-benchmarks/Manifest.gz b/app-benchmarks/Manifest.gz
index e26b2fc1d7b7..216a43f58639 100644
--- a/app-benchmarks/Manifest.gz
+++ b/app-benchmarks/Manifest.gz
diff --git a/app-benchmarks/interbench/Manifest b/app-benchmarks/interbench/Manifest
index b56d68896d7b..04f765fc33ab 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 602 BLAKE2B 1bc25b1f50eca7fe8bca31a88967536216a79ed1bb5a6ab88ebe4d44e0f79bc768325daecd97418b63a76ca9ad6f93b31bcf90b1c624a2f2a18b02afe71dddee SHA512 828200a2f609fb087238df6dbdcf99f287a2c3664e2f2d5caaa57f28b31ec65c45fafa7af2775e170006fca205bf1098ce074ae1257eee961c1c5e803be8097e
+EBUILD interbench-0.31.ebuild 695 BLAKE2B ee75de4e93e5c7811b2e4f6fbd9f6a38453d37a39ef5373f0324d86baddd662ec689ff369bba3d3223ffee72a7952bf6f430f3cba4438e6db05c6cb80ca35e28 SHA512 8555f2b646de2f818371eb84be2ba9437e519b7b7b27cad9f208cb8ce58d3dab538f93742358ed1ae03fc7eb2e364a57b842e796af7789c1352f5b08632116b3
 MISC metadata.xml 753 BLAKE2B 639fa1f66a592e317934dc098a2ce9bc4c994cc0445302ef04971ce42032b8cfcab32fec0e90fb1a0d027be44af2e44fcb358e45137fdd0b87cad3b631a3dca6 SHA512 b61817405ca8784c84377bcd4eae6ac561fc7ff305a3d24c8c541a1d4e91d93daa11e2461ac6b5e2daf754a6c558b65228145e354844ca59d41174d50dd27012
diff --git a/app-benchmarks/interbench/interbench-0.31.ebuild b/app-benchmarks/interbench/interbench-0.31.ebuild
index b77a5a4b1187..9735d348f47a 100644
--- a/app-benchmarks/interbench/interbench-0.31.ebuild
+++ b/app-benchmarks/interbench/interbench-0.31.ebuild
@@ -1,9 +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 toolchain-funcs
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="A Linux interactivity benchmark"
 HOMEPAGE="https://github.com/ckolivas/interbench/"
@@ -26,6 +26,9 @@ DOCS=(
 src_prepare() {
 	default
 
+	# Inline will fail, if optimizations are turned off
+	append-cflags -std=gnu89
+
 	tc-export CC
 }
 
diff --git a/app-benchmarks/stress-ng/Manifest b/app-benchmarks/stress-ng/Manifest
index d162db7b39b0..9aa9a5cee127 100644
--- a/app-benchmarks/stress-ng/Manifest
+++ b/app-benchmarks/stress-ng/Manifest
@@ -1,5 +1,3 @@
-DIST stress-ng-0.12.09.tar.xz 545756 BLAKE2B 72c5b1acf3f82f8d609da8b213f6321486cda9b8e05fd7390b846bea541610bab70bceb99c3684fbff732805eade7c37840d77e4ce901cc81a53ded0968bc6a1 SHA512 510b210a920b540c25e9f4cc0597924f72a80a85e6cd647346f7e91335e127e776bfa1bdcf0e67f557b7c154d2e6f2b2ed5abe9612b2552f53a8d21c920dc6c1
-DIST stress-ng-0.12.10.tar.xz 547912 BLAKE2B c4389911d4ae08c4e88347830e12d5371f527d12e1b638937ba3098ac2acb9818aaa6d13ee633325e71e33de9e80ddbc1b980fde41eaa102796e74d70ff0ac3d SHA512 e41bbc9b5b7ee884b21b6a4f667e2272344c5999c1ec44f9b16887fc5afd47b3c2940869f1951c812117fe42eebe6243500bc7559b7d0156dd6cab9a74be0f79
-EBUILD stress-ng-0.12.09-r1.ebuild 981 BLAKE2B 229a3cc6fb72e6e16afe844b97a174734b61ee33efcd4c8690e1a524a7fc18b9b16ae1d5e09e5b3d96e63ab83da1e6fd44bebc867bd2aaca4e316f1b27eb2919 SHA512 7eb8593afa5324ec1b4162de0450233014ca951b7ba75ff87634617ac78ee56fe1419fcb3903ca97f62d9c8a9ff878c50b179e0db31087919ef51b041243768d
-EBUILD stress-ng-0.12.10-r1.ebuild 861 BLAKE2B 504588591c0f907fa543f17bfebd05d52f4fbd950eab60f99f8879bfb19c8b8ca89b407e945e983121cae974d31a70a603b7ef9ab53a224acedc5f880c145813 SHA512 a2f9c9c86c514a5e6f26dc21f6cccd56ace01222cdb45ed9f04e8b9aa3a9b88b6c2fbf6ffdbd6a80f407eebb724dd14777578ec571c57d8d59a775f6aa285b4f
+DIST stress-ng-0.12.11.tar.xz 550336 BLAKE2B 01c8938b52f007a8124d57e8bab5033c54b13fe01c8bdf66d0a4e13a8acb6371d76f5939189474a41a291a34a0e20e83711430bae6e4993dcf8051bd89f503b7 SHA512 48fbdbab50f1da3aa22de672a3e6d03cb1776cc653916fc3f83bf67ebd419f6df876ca8248d0ea4ce34a9cc59c2e2f67f1b1e364a1ccfe0ebd1fcfe24cca0b6c
+EBUILD stress-ng-0.12.11.ebuild 861 BLAKE2B 504588591c0f907fa543f17bfebd05d52f4fbd950eab60f99f8879bfb19c8b8ca89b407e945e983121cae974d31a70a603b7ef9ab53a224acedc5f880c145813 SHA512 a2f9c9c86c514a5e6f26dc21f6cccd56ace01222cdb45ed9f04e8b9aa3a9b88b6c2fbf6ffdbd6a80f407eebb724dd14777578ec571c57d8d59a775f6aa285b4f
 MISC metadata.xml 834 BLAKE2B 01f0258893808f35495d063d634b3fecbb47e94cc6915ea605eedd6565e860bd42cbf181afa25e6e2faba396aa4c6da5d4e489af40bf5b11bd2ebb4e363e6994 SHA512 17c422c00bae52d5305ec4c34452c2bf86f280f2fcfa8c26710356023115828092d1d6f321e8ee194801b2d31413e07416041632ef692ad4128f8f99e389efb1
diff --git a/app-benchmarks/stress-ng/stress-ng-0.12.09-r1.ebuild b/app-benchmarks/stress-ng/stress-ng-0.12.09-r1.ebuild
deleted file mode 100644
index d0f6f93df409..000000000000
--- a/app-benchmarks/stress-ng/stress-ng-0.12.09-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit optfeature toolchain-funcs
-
-DESCRIPTION="Stress test for a computer system with various selectable ways"
-HOMEPAGE="https://kernel.ubuntu.com/~cking/stress-ng/"
-SRC_URI="https://kernel.ubuntu.com/~cking/tarballs/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-DEPEND="
-	dev-libs/libaio
-	dev-libs/libbsd
-	dev-libs/libgcrypt:0=
-	sys-apps/attr
-	sys-apps/keyutils:=
-	sys-libs/libcap
-	sys-libs/zlib
-	virtual/libcrypt:=
-"
-
-RDEPEND="${DEPEND}"
-
-DOCS=( "README" "README.Android" "TODO" "syscalls.txt" )
-
-src_prepare() {
-	default
-
-	# Don't reset build jobs to '-j0'
-	sed -e '/-f Makefile.config/s/-j//' -i Makefile || die
-}
-
-src_compile() {
-	export MAN_COMPRESS=0
-	export VERBOSE=1
-	tc-export CC
-
-	default
-}
-
-pkg_postinst() {
-	optfeature "AppArmor support" sys-libs/libapparmor
-	optfeature "SCTP support" net-misc/lksctp-tools
-}
diff --git a/app-benchmarks/stress-ng/stress-ng-0.12.10-r1.ebuild b/app-benchmarks/stress-ng/stress-ng-0.12.11.ebuild
index 309cd350a1c7..309cd350a1c7 100644
--- a/app-benchmarks/stress-ng/stress-ng-0.12.10-r1.ebuild
+++ b/app-benchmarks/stress-ng/stress-ng-0.12.11.ebuild