gentoo resync : 13.06.2020

7 files changed, 49 insertions, 6 deletions

diff --git a/app-benchmarks/Manifest.gz b/app-benchmarks/Manifest.gz
index 0ec789fc735a..8d96fe373b01 100644
--- a/app-benchmarks/Manifest.gz
+++ b/app-benchmarks/Manifest.gz
diff --git a/app-benchmarks/i7z/Manifest b/app-benchmarks/i7z/Manifest
index d1ca3776995f..933357ed2b84 100644
--- a/app-benchmarks/i7z/Manifest
+++ b/app-benchmarks/i7z/Manifest
@@ -1,12 +1,14 @@
 AUX fix-insecure-tempfile.patch 3615 BLAKE2B a25ae5d15a1757d45901fd8d783bb5fa2c80f8c2e54b46906b55679f1c45b5268f853ce373ccf9e85c60cff8daefd43120627a8e08b2b944363b58f30e68d207 SHA512 ec07232656ea18602f062562af9182be5cc6b5e4a073b15f7d5308bf9632e2abf546de2006f4e4bd4cf4bd8314d9df521235e2b3c4720d0dee88e4430705978c
 AUX fix_cpuid_asm.patch 924 BLAKE2B 8c73d3034a70ec5a4b0b9b704ee10f6db99c5d592f68bc26f058c6ec99f681e1f0d04ae417d498a31bdfea4a52676cfb3a71d967bff9a79bbeee46b28837c546 SHA512 ad0ea8751e753340b541fc13849c2cb5b2be1c3c297a7b40e508d2ac9abdd1b153918ef507d89db1d4b15ec1e1eedfe7cb3619376649a10abfb1f5880f6d187c
+AUX gcc-10.patch 541 BLAKE2B 1404efee8d8c931b856d17e064a471d20d99b3dfa512527b41290e2fd2f430889d23aa9374395886dab1cf852e21ce0d23199f35a4aa5ba9280791fae6e84cf7 SHA512 8d60de40eda74027886ea9ae3c515f97ea6cd7ec715aadbc080e652eaeddfc0fb64a5125f9c4c93fdf4b9aab3f7585878335aac16f92894797603b7b4e760126
 AUX gcc5.patch 1866 BLAKE2B 7792ec7852839317c9838617cb9fd85be0949afbe8cc456bf7f5587b0a934fb217a021c4d0a711d438553e15478e03e670f104bca122beaed4f68255c71139e8 SHA512 ad9a752bf3604136f2f3110c6053274581f6e5f6db56cede31fee2091d9b989b93f43d4658ca12f77bdf7c6ed78a0a06d8368ebea3ef20239fe707ae8e1a707a
 AUX hyphen-used-as-minus-sign.patch 2470 BLAKE2B e2c04874bae901475f1fadd1baf14d380182f25dd0ff41ab8879b1c2adf904475d6d5c64d0590abe638122653e7c0e3d8c44d713513b258b390df40f9f939fbb SHA512 05544e9f682bb6ccc1166182985ff4a4d19481ba555f63a0f030487ccc231cea9b2d1dfff83a95e9a2bcbf9d7dcc31cd331397cf84ef2ed253dac23fe9ecaa99
 AUX i7z-0.27.2-ncurses.patch 831 BLAKE2B afe6112d6007be9c2dbdc494b128c890632caea31380627f1d9daf24a26f31b91597dc6095d4477d9b67bb39d9931392b2727cf429e573e0ce6d709a42db52ef SHA512 71bfc336ce4378ae23b960229586bfe5270b4148a57a41d4bdc3aea7ae627a06d570861baddada0095f36fd0e974a9b242bb381460ce85441caf6deaa44d32be
 AUX install-i7z_rw_registers.patch 802 BLAKE2B 186862e797e903766767b035565a0a20814a8197051519a308a2774ad1d9556f17a91eb299ea050c83f9b91850fd47e77cbb7b4a41a73a5356f11267eb3f3624 SHA512 677df9ea9884d138f1eecb88b49ab96ac16f49cb63caf11fa63892940815e3c31e2170afadd0c73a2a571ff62b824be6109c0cda72779d76e03907da546f48d9
 AUX nehalem.patch 477 BLAKE2B e0f30d54f1da1cac0aafaea91641d5e626bbbdea6bc2abc6e1f6acf3c5e3d613cb1f0da5ff337fd8a44bc4288b981d83eaa63541291c0c397619f859b34b1da0 SHA512 5a647455d4fc4ff24689c9d4d6e936c346065ff2219de0bc61613a1044236df40fb815df0a136510ba2645bd01f172ba67486cbb9dc072dddf4308fab1824d7e
 AUX qt5.patch 365 BLAKE2B 4aa56d2b643ecc119122f549678d4cd1525bdba923067366c92fa0ef3a3b183b17668ad593d825223cb69bba883ede461439b05ecda1da29d27e6b3085a54f52 SHA512 fc38423e82f774aff588023b45154ea3bf3fd553ee6bc4261dcd0e7911d1d589754461a1734e0da969d03d6d94e2b844da6f09a388ce4508090d4ba5c75c7df0
+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 1396 BLAKE2B d02c06a61f53e531b44d1097480a3f42902d25c95d5a3823deeeceb64b56a96cc2c61a8ce009a1f74a2b4005b2414aba3a4d175aa93fb190b8af8f80774ac9e0 SHA512 b4499b80d9e6437affdc89ed1d3d730247ca32a3590febf876fff4b079a8719fff3e2165d67ae202aca7e4d7c4739f55ec57ebe0bd191cbbd321ff7fe78f0597
+EBUILD i7z-93_p20131012-r2.ebuild 1370 BLAKE2B 92870c287f04eeaa7549fcab1b613182fb0d3e5066486d8f01844ed673e01707ef2f8e6fd94e8bc7ca07a45c07333209d8a5413e2382e74a588310f66aed471d SHA512 753e682b123de2ad872619b2e2fffb9cb4e5753854ee0bbdc75c544d16620d1f3fe8c4300e0452c50cf2c9ca38eedc939d5a18f32b6edbddb558096d35fcacc9
 MISC metadata.xml 296 BLAKE2B c58dcfad78dd439c5fb57ba43d2c7694eee04f21dd6feef0af39c06d4980c37a02da0a1cea423d41cc2d32265be75b731a1a3866cda1e855af8efd71917900fb SHA512 a73fd853e9d6da0d414da279e6fea520e9f1f1ff76c73295640be542ed81391871a83f30f5739271c7044692398182217e42b59d75fe65ad4c5d949015009668
diff --git a/app-benchmarks/i7z/files/gcc-10.patch b/app-benchmarks/i7z/files/gcc-10.patch
new file mode 100644
index 000000000000..206b2c143402
--- /dev/null
+++ b/app-benchmarks/i7z/files/gcc-10.patch
@@ -0,0 +1,17 @@
+Author: Andreas Beckmann <anbe@debian.org>
+Description: fix FTBFS with gcc-10
+ gcc-10 defaults to -fno-common
+ see https://gcc.gnu.org/gcc-10/porting_to.html
+Bug-Debian: https://bugs.debian.org/957351
+
+--- a/i7z_Dual_Socket.c
++++ b/i7z_Dual_Socket.c
+@@ -37,7 +37,7 @@ float Read_Voltage_CPU(int cpu_num);
+ extern struct program_options prog_options;
+ FILE *fp_log_file;
+ 
+-struct timespec global_ts;
++extern struct timespec global_ts;
+ extern FILE *fp_log_file_freq_1, *fp_log_file_freq_2;
+ 
+ extern char* CPU_FREQUENCY_LOGGING_FILE_single;
diff --git a/app-benchmarks/i7z/files/typos.patch b/app-benchmarks/i7z/files/typos.patch
new file mode 100644
index 000000000000..9b1f3b952166
--- /dev/null
+++ b/app-benchmarks/i7z/files/typos.patch
@@ -0,0 +1,25 @@
+Author: Andreas Beckmann <anbe@debian.org>
+Description: fix typos found by Lintian
+
+--- a/helper_functions.c
++++ b/helper_functions.c
+@@ -528,7 +528,7 @@ void Test_Or_Make_MSR_DEVICE_FILES()
+ 								n=`expr $n + 1`; \
+ 							done; \
+ 							");
+-            printf ("i7z DEBUG: modprobbing for msr\n");
++            printf ("i7z DEBUG: modprobing for msr\n");
+             system ("modprobe msr");
+         } else {
+             printf ("i7z DEBUG: You DO NOT have root privileges, mknod to create device entries won't work out\n");
+--- a/perfmon-i7z/helper_functions.cpp
++++ b/perfmon-i7z/helper_functions.cpp
+@@ -484,7 +484,7 @@ void Test_Or_Make_MSR_DEVICE_FILES()
+ 								n=`expr $n + 1`; \
+ 							done; \
+ 							");
+-            printf ("i7z DEBUG: modprobbing for msr\n");
++            printf ("i7z DEBUG: modprobing for msr\n");
+             system ("modprobe msr");
+         } else {
+             printf ("i7z DEBUG: You DONOT have root privileges, mknod to create device entries won't work out\n");
diff --git a/app-benchmarks/i7z/i7z-93_p20131012-r2.ebuild b/app-benchmarks/i7z/i7z-93_p20131012-r2.ebuild
index 47b4c7b42ecc..c2e8656b7af9 100644
--- a/app-benchmarks/i7z/i7z-93_p20131012-r2.ebuild
+++ b/app-benchmarks/i7z/i7z-93_p20131012-r2.ebuild
@@ -36,14 +36,13 @@ PATCHES=(
 	"${FILESDIR}"/install-i7z_rw_registers.patch
 	"${FILESDIR}"/use_stdbool.patch
 	"${FILESDIR}"/nehalem.patch
+	"${FILESDIR}"/gcc-10.patch
+	"${FILESDIR}"/typos.patch
 )
 
 S="${WORKDIR}/${PN}-${COMMIT}"
 
 src_configure() {
-	# Workaround to build with gcc-10 until I find a patch
-	append-cflags -fcommon
-
 	tc-export CC PKG_CONFIG
 	cd GUI || die
 	use qt5 && eqmake5 ${PN}_GUI.pro
diff --git a/app-benchmarks/stress-ng/Manifest b/app-benchmarks/stress-ng/Manifest
index bc9555d731d8..fe5636dc2a4b 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 755 BLAKE2B 9898148af6daebe2eb629e0148471e320df3ff620349f2a59349e325c62ff35eb899fb00c8f949f4d23045593bdeacfa780641bcc16bc3512453636e51b6b57d SHA512 3f090ecbd19f577f1ed03ff2918f65e172e1873c7fad9be4c573fc683b443e8706d508bf430e699d48fe78e41aa33c6b88b6b03e82075bc8c8fd7ed5c27996f7
+EBUILD stress-ng-0.11.10.ebuild 762 BLAKE2B 0ae9493eb2c03f913c6115f54608a43eaba6370296a2a824ff6040b236e118645c7a7344b23b873b414f56ba625cc752eb260e38387104720f72401d59f55746 SHA512 c3fcadf84d8a0ec0e37bf568e0920bb1f24b12eec08f544a1383ec2503c1472d56b27829ee017d813f0ffc3f1c4ef0ea64954839362642219a0db9320f098191
 MISC metadata.xml 834 BLAKE2B 01f0258893808f35495d063d634b3fecbb47e94cc6915ea605eedd6565e860bd42cbf181afa25e6e2faba396aa4c6da5d4e489af40bf5b11bd2ebb4e363e6994 SHA512 17c422c00bae52d5305ec4c34452c2bf86f280f2fcfa8c26710356023115828092d1d6f321e8ee194801b2d31413e07416041632ef692ad4128f8f99e389efb1
diff --git a/app-benchmarks/stress-ng/stress-ng-0.11.10.ebuild b/app-benchmarks/stress-ng/stress-ng-0.11.10.ebuild
index d50be0f6a38a..b2cfc3fbc768 100644
--- a/app-benchmarks/stress-ng/stress-ng-0.11.10.ebuild
+++ b/app-benchmarks/stress-ng/stress-ng-0.11.10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://kernel.ubuntu.com/~cking/tarballs/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
 DEPEND="
 	dev-libs/libaio