gentoo resync : 25.08.2020

16 files changed, 32 insertions, 40 deletions

diff --git a/app-benchmarks/Manifest.gz b/app-benchmarks/Manifest.gz
index f83811ba687d..a117d0ba1f1d 100644
--- a/app-benchmarks/Manifest.gz
+++ b/app-benchmarks/Manifest.gz
diff --git a/app-benchmarks/bootchart2/Manifest b/app-benchmarks/bootchart2/Manifest
index f012a60f9126..2dfbad8206c3 100644
--- a/app-benchmarks/bootchart2/Manifest
+++ b/app-benchmarks/bootchart2/Manifest
@@ -3,4 +3,4 @@ AUX bootchart2-0.14.8-no-compressed-man.patch 802 BLAKE2B 0d09c6a2de65079c0c928e
 AUX bootchart2.init 693 BLAKE2B f91997826a6128f3f496f581d662b3a8c7749f978f442700c9e7f910d0a5d4e62f5f91fac63958f85fcc08f17fcc0710e5553abb36fc0d90f6c70c0191f63b61 SHA512 181ecf9b64c8303ade8544530698a6a217c367927673feaca4d837bb72d13922d47eff9374a482cd225c3189ea80d36ba72ff658aba596f96639f0d1be7a432b
 DIST bootchart2-0.14.8.tar.gz 1175527 BLAKE2B 623ca2269420eda79b09d955ab9d4a37af004e9e97ad0e0c6014e53b4b0c63239661cb5359345306504980b060ccd11488970cb0aa3d832bfb55392724e715dd SHA512 58303db91d22ccc44c0dc765e7a6672fb277840555fd87ce64b8987cba85250cfe3db17f3ec7e0e1e726ad59166a5d3d01a7a262c07b5690c595877b46c66bd0
 EBUILD bootchart2-0.14.8-r1.ebuild 1504 BLAKE2B 7e94059446d518143da9777071856eb4a6aa57be301c746ef6ff679bf7db27fead2aa7f6ff4fe4ab132f89628b6329d35221c6df19356fe33a2c85f8e09a9563 SHA512 aa90f3d8658f05e5be84b853e1aba550a713add56ee0cdc0e5af3367a435f2f46942dfa60c028febe75a760869f258900910dea7a49035c883a94e80077735ad
-MISC metadata.xml 304 BLAKE2B 171fff1d72aaecb2e11f9d712aae9b40aba252d315f63184036d3757a92843f3e898b7e723b617014bca29b95f928a720ec7115a564766704514e8bc5b826e4a SHA512 a32bf175ccbaf61207413ae249aa66e72c7704abc0e1c41e9a6eb5fbbc21ea143f45588490ef53bbc8a5ffa0145880de87308ed33df9354a1433016f6540f46e
+MISC metadata.xml 253 BLAKE2B a969428b01c1eaff1fd60bb01a680ef87176e7f42357b1a856794b89837883e1259a693443fa8962f2082a581aa991af825704b512006de0ad69843758621a4a SHA512 47789cdb32320e00dee34974dd0649bf59dc44f3556bd4e8d4126051d6000b000e826517fee35a53531d91df87b6c4e55c01f48d62c329ef893fe95a01c78297
diff --git a/app-benchmarks/bootchart2/metadata.xml b/app-benchmarks/bootchart2/metadata.xml
index 59b22aee67c9..b714966c25dd 100644
--- a/app-benchmarks/bootchart2/metadata.xml
+++ b/app-benchmarks/bootchart2/metadata.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>jlec@gentoo.org</email>
-  </maintainer>
+  <!-- maintainer-needed -->
   <upstream>
     <remote-id type="github">mmeeks/bootchart</remote-id>
   </upstream>
diff --git a/app-benchmarks/cpuburn/Manifest b/app-benchmarks/cpuburn/Manifest
index 5d204c6fe59b..c5f8baa9328c 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 1360 BLAKE2B 71ed48cd60d3565e2ca1dee195c4da3aa4b4d077def0b100f78950b8d930ec86f6cd8bd2c3ce32e73de2f1db5b1341625922aa200163c64d81a10d47eb8fc28c SHA512 22a7db9db6a388d1870d15cfcf1bb8f7b0742eb637b5a0591cd9e8e286295a9c99b3c823ff6069a9a9dec5dc457d66ac3da676d896f9df5982ad72469bc06684
+EBUILD cpuburn-1.4a-r3.ebuild 1358 BLAKE2B 61eed5731e5f1244521f229cd7ce420138c1e8af5820a3e0dc467171174fb6e293d4b31a6452f9ef85b908c5b811bb7baaf30ff4a9c48f336aba5b9e04478f07 SHA512 54357193326c9586fc80772bcc8200dba4646942c3e19662cf7fd77bfdcf66cf9b79b77957b5cdac094d8d082bd8cf9ee5e1f31a20c2bda2facc1138ea037fd7
 MISC metadata.xml 483 BLAKE2B bdcff8e39301ded7c0b82902705c2ea042b5cbd47a83c37297cb03e839824cdb053ad08179a609732bf6a49c4e81ecb4d82a2dcf91d1faaf3418db7354d4c80f SHA512 68622fc4b0eb6b6df0025befd216eb6d6e8a502d7e2c176251963510221261834d3dd046c7e9d141794530ea504dcbe3087e8336711b4c131b38ad345dc1dd1a
diff --git a/app-benchmarks/cpuburn/cpuburn-1.4a-r3.ebuild b/app-benchmarks/cpuburn/cpuburn-1.4a-r3.ebuild
index ed2a072e4682..0026ef70327e 100644
--- a/app-benchmarks/cpuburn/cpuburn-1.4a-r3.ebuild
+++ b/app-benchmarks/cpuburn/cpuburn-1.4a-r3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI=7
 
 MY_PV="${PV/./_}"
 
diff --git a/app-benchmarks/geekbench/Manifest b/app-benchmarks/geekbench/Manifest
index 32c6a00597b0..00e805869ffd 100644
--- a/app-benchmarks/geekbench/Manifest
+++ b/app-benchmarks/geekbench/Manifest
@@ -3,11 +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.1.1-Linux.tar.gz 92622793 BLAKE2B 178b57d02de43e995f4dc39bd9514bb30fbe470d82572ba43aac08004609c07c656285beb543b3e3832df39bc2e26e41bb8c7d1f617f0846f930183e67a73436 SHA512 0f0a8206ced8cbaf271d964ece273a800bdd1d5b5918130aca2e31cab59f7d716c1b714b96a934e5b0fab8a9b73d1fcdc7ea9cd7ef37963b1a923cdefb542a78
-DIST Geekbench-5.2.1-Linux.tar.gz 92898328 BLAKE2B 8a989b3921e8da467ffcaea1a466053ce1eae2d30991e8ad0a468cdb2c167e39729381e2f465abc9002eaa1569a4d912bdda3c1774689b35d8edb4778ab0bc90 SHA512 5d462cbb78b0b2a132fc5fbe0e65e9755d67232b22b6f2a541fa5aa1a90bc6768b3255759019218a94df0bb82eb9aeaad7dbb6b7cb0e8cc79a95d21fb9a8960b
+DIST Geekbench-5.2.3-Linux.tar.gz 93047726 BLAKE2B 22cf414d89ef8854b8797ed7ad6b674ff6162daa003745d94c0481a71a2b7c1b7fbfd06d7a0e997b41da2107feb27a69af768196bf4114681c8bce39d2640112 SHA512 cacc1014b1522de281704e5210c44b81a51b24b63fb4c4be3c28e729261af2f12c5a52ad2a79b10bf597a1b24378cf03d7483d032d5e0c483069f8dc2695339e
 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.1.1.ebuild 1030 BLAKE2B 942a330df0da458054979c0137d63a06ffd94aaa139a29c5cf291438cc64f7b1563df1d66ecf3e6d3779c860ea060f84efb66daf48871d22f51d798d43c12f10 SHA512 8885a9815bf0788ca460fe8f063c68fb215c0d8888649a49c05d0331182d98f05ae82cff35efec13366a2bb07a480d08fb578d17e01d6fc04b304db7c9d9ebbf
-EBUILD geekbench-5.2.1.ebuild 1031 BLAKE2B 9ed111d7e9a060d502d7056da19f99b7606f3b037cb0503c2f68e9f3e6907248f4ae123d740a90a2ce4977ca554dcd616cb67ecaf73c244c8857ea19d91587fa SHA512 d6a4212be1eae1094b32ed614b436c199f7a952d6b151321ed79237b3d4694691812ad0881c63984d17b1da9f6403a40f226ad7e65ea19d46db4265fc2491e5f
+EBUILD geekbench-5.2.3.ebuild 1031 BLAKE2B 9ed111d7e9a060d502d7056da19f99b7606f3b037cb0503c2f68e9f3e6907248f4ae123d740a90a2ce4977ca554dcd616cb67ecaf73c244c8857ea19d91587fa SHA512 d6a4212be1eae1094b32ed614b436c199f7a952d6b151321ed79237b3d4694691812ad0881c63984d17b1da9f6403a40f226ad7e65ea19d46db4265fc2491e5f
 MISC metadata.xml 250 BLAKE2B d57634b040c498296655940e3ee580c8580075a4190e2600113cee5548ff44a2025568380f3d5d9f3ca0fcd1ea5d41c9871395ffbcf4bd32d8df6a494852a885 SHA512 c225bdf339347a1768b255d905f3831904cdc375f3d4e90e41c68645b8bcfe2dfdf8e6aa4c67063103f459808a387c8edd9b35b073b8be175f7a3bd490fe3dca
diff --git a/app-benchmarks/geekbench/geekbench-5.2.1.ebuild b/app-benchmarks/geekbench/geekbench-5.2.3.ebuild
index 82d4a4a67fbf..82d4a4a67fbf 100644
--- a/app-benchmarks/geekbench/geekbench-5.2.1.ebuild
+++ b/app-benchmarks/geekbench/geekbench-5.2.3.ebuild
diff --git a/app-benchmarks/ioping/Manifest b/app-benchmarks/ioping/Manifest
index efbd209cd683..d25834fb49f4 100644
--- a/app-benchmarks/ioping/Manifest
+++ b/app-benchmarks/ioping/Manifest
@@ -6,4 +6,4 @@ DIST ioping-1.1.tar.gz 29251 BLAKE2B 2f0ec642c3545b8e603f90187f48bf44e1ef665a99b
 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 559 BLAKE2B b67460679e31d60d569972827b4864035b02ce73e7e9cf2217b1869aee3345e23e54cdddd14d757976dea1e07685f53c16c1f1ac9dbe6c409036fa5beb5559ba SHA512 e9ace78008176fd57af48bf30591d3ce77f95c8b17a3dd25b3bca93c8c762cd80bde191f183f2be5fe800911f2d9f8a094554dfbcbbb0b5c4fc80e17d28931c0
+MISC metadata.xml 479 BLAKE2B 20009ac7e05778a61c18464c51b4e49de524463de99c4620e311e59483584e02566eb9578a78b287a31f856dd2c1bc8740d9e674dd64f259f18279bce4d0f04f SHA512 b03f0bdae0a21ee5144a163b4c1a1083a190dc198b8468fad9381e0928f5a91826702e2342ff6068e9e43db999c612204da5c236fde46b09c2b801f1ce0b3084
diff --git a/app-benchmarks/ioping/metadata.xml b/app-benchmarks/ioping/metadata.xml
index f1fd644784b8..55ad5be23a2b 100644
--- a/app-benchmarks/ioping/metadata.xml
+++ b/app-benchmarks/ioping/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>jlec@gentoo.org</email>
-  </maintainer>
   <maintainer type="project">
     <email>shell-tools@gentoo.org</email>
     <name>Gentoo Shell Tools Project</name>
diff --git a/app-benchmarks/ramspeed/Manifest b/app-benchmarks/ramspeed/Manifest
index 7735fc9f1f5a..a1031c8e23de 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
-MISC metadata.xml 354 BLAKE2B cbf3eb04d7171a135903e066fb9a52d788ce37a7406152116c88e695d4c3c144ca2221c789edbfa31861a36695ffd86c7cd3742a81f43c93748ce1663f771133 SHA512 38abbd2b91db1482fb69ccb45150c2f03331e4e4730754c1374a68f0e6b58bdf98a965a802e666473323894c7a91d8aa5a164bc929b3fbcd435163ed9c3d2306
+MISC metadata.xml 272 BLAKE2B 00654bf98bfecb8cae8d9ceb6b05da17f5dc2aa7ebc11bcb5fb144372ddb37283d867c232ea19a7d5b72714c678f392ade3a17d16d8067e10ddb546990bb4dd1 SHA512 04479b0e225e0ee99ae1915b131f1d85bd455f324fbc902073e4365feb79164d3b64b4bc02d105ef78bc9553fdd9617a8b96709272ac9abb142d85de568e856d
diff --git a/app-benchmarks/ramspeed/metadata.xml b/app-benchmarks/ramspeed/metadata.xml
index d84a11e08048..d03ea47e8abc 100644
--- a/app-benchmarks/ramspeed/metadata.xml
+++ b/app-benchmarks/ramspeed/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>jlec@gentoo.org</email>
-    <name>Justin Lecher</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <use>
     <flag name="pic">Force shared libraries to be built as PIC (this is slower)</flag>
   </use>
diff --git a/app-benchmarks/stress-ng/Manifest b/app-benchmarks/stress-ng/Manifest
index fe5636dc2a4b..5e06f0ac6587 100644
--- a/app-benchmarks/stress-ng/Manifest
+++ b/app-benchmarks/stress-ng/Manifest
@@ -1,4 +1,4 @@
-AUX stress-ng-0.11.02-makefile.patch 1802 BLAKE2B 1fa9fb57e31a8f0ff60e9a60140e8e85064840f215ba00e82d292737ec37889c3c3bb92cefd94a56104a5e80df69468e3ad7b38cbebed3f8c009dcf23932194b SHA512 7a697fc4c1dfc8e462362e0d3fe99d5432afbf921f2de91963f623163bbcbc0642e61444bb053e673661659d11c22f5a6932668b8a25d9d7564b19eb87467554
-DIST stress-ng-0.11.10.tar.xz 443208 BLAKE2B 273d98c8e8a7664e2ecd6431f0988b417980d9faf05550a80a0a90505907eec24eae5f717f4bd813f128f22870343861472bc1157373deb0aaef365b85de44fa SHA512 ae83fa107d17fe55c27429d4b0763db2b56c83d5ab88f4738f9b0be74a34c8adbb6d1dd7a5417ff1399c394c9a18c900265705f21c1cf123e0cc8361cb8214fe
-EBUILD stress-ng-0.11.10.ebuild 762 BLAKE2B 0ae9493eb2c03f913c6115f54608a43eaba6370296a2a824ff6040b236e118645c7a7344b23b873b414f56ba625cc752eb260e38387104720f72401d59f55746 SHA512 c3fcadf84d8a0ec0e37bf568e0920bb1f24b12eec08f544a1383ec2503c1472d56b27829ee017d813f0ffc3f1c4ef0ea64954839362642219a0db9320f098191
+AUX stress-ng-0.11.17-makefile.patch 1752 BLAKE2B 999a2bd729c0b3d3184010ffe5ffb5d59cf82fead7a16199c2ce1abd37dcfd3a665f4644b8d740ece4b92fa2f543e84d57952b13bac728a78ed0f749d106459c SHA512 affe4f5a324e009f10f0ed26dd8dc6d1ab7938da8574392c2514f307c1e4a46a85b0fcf7c3820e6f147f1150483f811b314d82b73ca7f605167ffa8d50c4691d
+DIST stress-ng-0.11.18.tar.xz 473268 BLAKE2B 1a10fab7fc98dad72f59f871e148980b3a7ea29d62badcc7a41ae72598cd99b880da10927a8809b5785040aaaf93a4776801304a43bf3d7bcfbbf19d5b488cd2 SHA512 c6871cfb6b72fae83ad2d8a4877363b81e5674d1670faa24c7a54951020f177f9a81033506207032a0b2bf39269fb09c6d8a6842d41285ee75135a37ad8e781c
+EBUILD stress-ng-0.11.18.ebuild 845 BLAKE2B 4b9188d58644d0746355fab936e7553a2d8ebd3d2279793cd5c1abc4cc0096c920f2bea11039a22d6e6b10068ccb2468a947956c8039f1ca807cae3c7301acaf SHA512 a8870c9880a3acf73d8914b4668cdb2ccc37ecb64e9bb2006a0f59bb9b0eb2059be53ca6e1924daa99eaea5384e842219a07550e1e48d8c9ad522e72a74febb8
 MISC metadata.xml 834 BLAKE2B 01f0258893808f35495d063d634b3fecbb47e94cc6915ea605eedd6565e860bd42cbf181afa25e6e2faba396aa4c6da5d4e489af40bf5b11bd2ebb4e363e6994 SHA512 17c422c00bae52d5305ec4c34452c2bf86f280f2fcfa8c26710356023115828092d1d6f321e8ee194801b2d31413e07416041632ef692ad4128f8f99e389efb1
diff --git a/app-benchmarks/stress-ng/files/stress-ng-0.11.02-makefile.patch b/app-benchmarks/stress-ng/files/stress-ng-0.11.17-makefile.patch
index bce1907d139d..d3c5e93b0074 100644
--- a/app-benchmarks/stress-ng/files/stress-ng-0.11.02-makefile.patch
+++ b/app-benchmarks/stress-ng/files/stress-ng-0.11.17-makefile.patch
@@ -1,8 +1,5 @@
-Always respect users CFLAGS, enable verbose output when compiling
-and don't install compressed man pages.
-
---- a/Makefile
-+++ b/Makefile
+--- stress-ng-0.11.17.orig/Makefile	2020-07-27 13:38:23.000000000 +0200
++++ stress-ng-0.11.17/Makefile	2020-08-09 13:43:30.919796477 +0200
 @@ -21,7 +21,7 @@
  # Codename "synthetic system strainer"
  #
@@ -12,10 +9,10 @@ and don't install compressed man pages.
  
  #
  # Pedantic flags
-@@ -357,12 +357,10 @@
+@@ -358,12 +358,10 @@
  .o: stress-ng.h Makefile
  
- .c.o: stress-ng.h Makefile $(SRC)
+ .c.o:
 -	@echo "CC $<"
 -	@$(CC) $(CFLAGS) -c -o $@ $<
 +	$(CC) $(CFLAGS) -c -o $@ $<
@@ -27,7 +24,7 @@ and don't install compressed man pages.
  	@sync
  
  makeconfig:
-@@ -383,7 +381,7 @@
+@@ -384,7 +382,7 @@
  		sed '$$ s/.$$//' >> apparmor-data.c
  	@echo "};" >> apparmor-data.c
  	@echo "const size_t g_apparmor_data_len = sizeof(g_apparmor_data);" >> apparmor-data.c
@@ -36,9 +33,9 @@ and don't install compressed man pages.
  	@$(CC) -c apparmor-data.c -o apparmor-data.o
  	@rm -rf apparmor-data.c apparmor-data.bin
  
-@@ -399,12 +397,12 @@
- core-perf.o: core-perf.c core-perf-event.c
- 	@$(CC) $(CFLAGS) -E core-perf-event.c | grep "PERF_COUNT" | sed 's/,/ /' | \
+@@ -401,12 +399,12 @@
+ 	@$(CC) $(CFLAGS) -E core-perf-event.c | grep "PERF_COUNT" | \
+ 	sed 's/,/ /' | sed s/'^ *//' | \
  	awk {'print "#define _SNG_" $$1 " (1)"'} > core-perf-event.h
 -	@echo CC $<
 -	@$(CC) $(CFLAGS) -c -o $@ $<
@@ -53,7 +50,7 @@ and don't install compressed man pages.
  	@touch stress-ng.c
  
  $(OBJS): stress-ng.h Makefile
-@@ -453,7 +451,7 @@
+@@ -459,7 +457,7 @@
  	mkdir -p ${DESTDIR}${BINDIR}
  	cp stress-ng ${DESTDIR}${BINDIR}
  	mkdir -p ${DESTDIR}${MANDIR}
diff --git a/app-benchmarks/stress-ng/stress-ng-0.11.10.ebuild b/app-benchmarks/stress-ng/stress-ng-0.11.18.ebuild
index b2cfc3fbc768..4c88cc73a967 100644
--- a/app-benchmarks/stress-ng/stress-ng-0.11.10.ebuild
+++ b/app-benchmarks/stress-ng/stress-ng-0.11.18.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit toolchain-funcs
+inherit eutils toolchain-funcs
 
 DESCRIPTION="Stress test for a computer system with various selectable ways"
 HOMEPAGE="https://kernel.ubuntu.com/~cking/stress-ng/"
@@ -17,10 +17,8 @@ DEPEND="
 	dev-libs/libaio
 	dev-libs/libbsd
 	dev-libs/libgcrypt:0=
-	net-misc/lksctp-tools
 	sys-apps/attr
 	sys-apps/keyutils:=
-	sys-libs/libapparmor
 	sys-libs/libcap
 	sys-libs/zlib
 "
@@ -29,10 +27,15 @@ RDEPEND="${DEPEND}"
 
 DOCS=( "README" "README.Android" "TODO" "syscalls.txt" )
 
-PATCHES=( "${FILESDIR}/${PN}-0.11.02-makefile.patch" )
+PATCHES=( "${FILESDIR}/${PN}-0.11.17-makefile.patch" )
 
 src_compile() {
 	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/Manifest b/app-benchmarks/stress/Manifest
index 59abe2039f59..c202853fb66b 100644
--- a/app-benchmarks/stress/Manifest
+++ b/app-benchmarks/stress/Manifest
@@ -1,3 +1,3 @@
 DIST stress-1.0.4-r1.tar.gz 191800 BLAKE2B 560065d963823e734bb706840908998a58c07c82b21ab579f7a0fd5163e7a8591ca0f6abe430bba058bafd9a2dac1fcf33f011663cd6c3d2fdefb221a49e5e8f SHA512 623a7d9585828bed4b7673e19fb0cfdda904552cd56353d74106047b64249299d5f8da892ec135f1781ec3984c7d5835dcc6c0d8e659e06c8a1e4fb2af9fd9c4
-EBUILD stress-1.0.4-r2.ebuild 510 BLAKE2B 18bba376b45331590ea482d9fb10aa434ffac26e62a5ee3d8a0350a002a9126f243ece62fbaeb991db929aa19475970209f215dae24c5e031e06af8115982be2 SHA512 9d93425d466e7a2a2cf5afa9e7a0b6aa81fc037c455d780284657483ffe318d578b9cc686111c166c5e5a3468c1e3a9bedf5903dc4d10b4abc0f7bb99a6cc05b
+EBUILD stress-1.0.4-r2.ebuild 508 BLAKE2B 135bd5cade1e0c0207b165fe8b3ec8d25ea6e5543ff11abfd9412abbae3c8854c6c5a8c46630465ff37f1e3960550cf2eb5181723fab049930daa7d7317c1b63 SHA512 df7987d9b8bf1cfdf45ae9f4d0deb24c161c0d58737d697024618b224ab709d9d8bcc417f38a3001890bcfc83163937de8b246d44d16787faa504e90aa8a379a
 MISC metadata.xml 448 BLAKE2B 32fcc7cc3e3426402d1616ce702ae6c58ee7e440d6e1c42858f081a31933af35645300bad9dd228129714230cc1da58ca9f1f8706e5a8c66abab0edfbed2d5f7 SHA512 dec4009823731cbc2dd66b560aa8071cfc41bc8c2624bccf28749e93abde54ee0ab5964983d03ec02cb2380d7661c5fd5c34781fddd4c3ebecec7eef96bca6e8
diff --git a/app-benchmarks/stress/stress-1.0.4-r2.ebuild b/app-benchmarks/stress/stress-1.0.4-r2.ebuild
index 0ccec3030783..4524dbc33bb2 100644
--- a/app-benchmarks/stress/stress-1.0.4-r2.ebuild
+++ b/app-benchmarks/stress/stress-1.0.4-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI=7
 
 DESCRIPTION="A deliberately simple workload generator for POSIX systems"
 HOMEPAGE="https://people.seas.harvard.edu/~apw/stress"