gentoo resync : 05.02.2020

4 files changed, 63 insertions, 4 deletions

diff --git a/sys-power/cpupower/Manifest b/sys-power/cpupower/Manifest
index e1ec020930fd..f69e131ee3b4 100644
--- a/sys-power/cpupower/Manifest
+++ b/sys-power/cpupower/Manifest
@@ -1,11 +1,12 @@
 AUX cflags-strip.patch 423 BLAKE2B aaa63551049273cc00abb0bb71da662e7c44ae7843cbeac60625cf75db872a68d23adfc439080ed2641d00693ff474e594f82b3a03e2173801d5e549b7430ebe SHA512 546c6c8187638cae094a428226c9c7463168b66fb1d16ffb05167a2bb5fb8792c08b6a68e71cbabaaa95aac352ca5ad4c1fce0a3a6fded6863b40c1ed1a5b4c0
 AUX conf.d-r2 1616 BLAKE2B 94083b666d5ad43270ec458488b9a6070a33d0d0611a6430e9d44eddc663197cc715c173d1ca1a67a15e012dbd60a08677d85f2e771bbefff7fc9ef4a4b16b88 SHA512 63cd12a4d8782198c71662e9205e346e064b65bae5e3e175b5bc43bdf7ec6ddf675b60349750afe3c37c8a925f9ae9a93530671821342581bd282a69e0773b8c
 AUX cpupower-5.4-cflags.patch 900 BLAKE2B 6ee752113b03bcd9665937eaf1270337baaef7c6d08503373c2d0890a58fe329d4ae3f1fc40dc80cafdbba94e1f41c87d11530855f8f1b26f67c14f63dc54ec9 SHA512 e765ad5141bbffb27ca357a71dd1360636fa5965d4058f209cb6b5ff3bbe7d8f15c270cb6a1f0dfde4bebe47adf96169f1e9dff9a41dceca080229aebc0a1677
+AUX cpupower-5.4-gcc-10.patch 2131 BLAKE2B c31074f0d7626249cf3125fac986370c28eeb421bad6428d697faf4567ef62b3af7fa21b77f88c78784c47caf5f00bf599a6e893f3003617bdf931b14727ba0e SHA512 37fa5c4ee11421aa600e6b552fc31643577fb4369e6fc7c0c1fd51810e8ef8d820399c9ed0a524d48798d96d9e71e2fc28bd0380599b998cd73cea821574ca15
 AUX cpupower-frequency-set.service 151 BLAKE2B ff5a2460bf2080868157ea2b975b9d401f2b47e2c8e77d29ac1528f6b85246394e72d57a88dfacb0242fc1e563eefd0a102d2d6dae877c6e779383a0b163a8f3 SHA512 dcd6bb5dee338113683c2e222df23195857f44f5430569b3c454078d0650c15fa2fa3876dccd6ee4652d0fd409f925205d0d3e57344487a64945c67a3b0dee67
 AUX cpupower-frequency-set.service.conf 41 BLAKE2B b1349f0dc39ee39e7c1442374bd92e069509f106c80206c4a606d732acd2cc6205e2032eb98e4890ef006a8bda5fd65d18b83881aa55008a55375d0bc170efe2 SHA512 d99b78a5ab4f7b4e8fe92bc0b2cd722cd55e97e234027a0eba37eb39739e2a470bfc369efa9cf7846bf1a6d588d9d5d5d9efbb90a68aac2f687ddeb833e291f1
 AUX init.d-r4 804 BLAKE2B b143305b3f117afa49967de098f54419d5f57b86dee7e7153b7adb02331a88d3b90a0a085ee189c0b6de70050de4a1249d481d23816764aad34d416f041f78b3 SHA512 7f6992b17376c0bedb403586e123200272d293b15819260cacd182c19ecdb2da635b177fe3d621ad8605a4ff046fd23669e67ea0bd8f00c9e4339d3ac72d2ddf
 DIST cpupower-4.13.0.tar.xz 67812 BLAKE2B 3b94b18bb57b0499a96d57ca26a48f528bf993e0f1ed7eb6d2949c879de8796501629bd0978946eae925d86dd3204a1cab0c99f1c3a8b51731dfbdb61451e990 SHA512 5e7095e2741eae920a097864926931afb2656e492b504f203c40c24ddc5aee5014c7689b220225171b5ea10c69b70774fb2a979d05ea56ef1fa063f3097626c7
 DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
-EBUILD cpupower-4.13.0.ebuild 1660 BLAKE2B bb54f0810ff4d44a068d1e8e009e8d96daef318e60bc73df9e79dbc2bead8336daf2cd4ee3a6a21db7c4b00c2c655d166576cb0c91bdf63f742dd9064871ee6d SHA512 a819a13af0d6baca8c3e87afb350fad329d909e31945e492a38c559a7783bc2ca4630ec1a7c2ebfd191e331bb6b8beaacd6ac5fc19bd1ec4f13df6868774bb8a
-EBUILD cpupower-5.4.ebuild 1645 BLAKE2B 025dfcb9d74ee02f9d2b083ed7246630b9e5c7aee114446c54caf4d57b005ef8a388add25e98ffecb86ed01deaffda390a268e8e52d7d44383e4aa5224f2c899 SHA512 60e837f09d331399c171ee695f04ff083ebc7e33a7ced62c7b9fb50b0ec4d2181ec306b7f2ff0b7250014311dd6050f35352d14f1a8dd20ca16621b46c0e7329
+EBUILD cpupower-4.13.0.ebuild 1660 BLAKE2B ff75f066e9c8bf6b4a7a7e081dbb8112ca327fe5ca94edf45eccb1ae703b1139ec6011e50cf03f2639d577087ad2160e3b737b71687edc7945c3d84f974d7510 SHA512 252c9a1b97d68faa2145fba563f8952fec6d541291e62673482ea2dd5c225ae12afeb68324d0bdc41707d667056fdb43c147d7035817f3b3b1f09d032c9a4d59
+EBUILD cpupower-5.4.ebuild 1686 BLAKE2B 56c6d3bfc5744308e1d016bbcdcd55ab83917a6803c76af4881caf65bbda4f37ce61b8b45d5e79f0a3774e612d0d04bb19eff7acb35d95d2a47639acc3bc42f8 SHA512 04ad5ed7eff5dad70c83d2de140d54814ca215289ef53004863dfc4d080df3e8723ae731f25384ec40f2b07c6f04beec82fcf90b6a94ad5a8715c807a40b4c5e
 MISC metadata.xml 340 BLAKE2B a03552056a3b361eecd25b085c5f3fe60af7d1dbef9bb74682066b2d87c92b91a7a3d5cb53d1cbb88d85f81982a4b7ee4f8c5ff15c1fd06a266447f2d309ffd9 SHA512 af0ccc6342a6f6095d2bf06f764729e2a3eaa885d95da97462e15e3f5d139d3260e4c6e981e1d1194f4c0b64d3216decf223f854ad80e580092af8235399e054
diff --git a/sys-power/cpupower/cpupower-4.13.0.ebuild b/sys-power/cpupower/cpupower-4.13.0.ebuild
index b3ea8ec6d435..6604b6c35df8 100644
--- a/sys-power/cpupower/cpupower-4.13.0.ebuild
+++ b/sys-power/cpupower/cpupower-4.13.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 2013-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/sys-power/cpupower/cpupower-5.4.ebuild b/sys-power/cpupower/cpupower-5.4.ebuild
index d45b53b560a1..e2aa6103417a 100644
--- a/sys-power/cpupower/cpupower-5.4.ebuild
+++ b/sys-power/cpupower/cpupower-5.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 2013-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -24,6 +24,7 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
 	"${FILESDIR}/cpupower-5.4-cflags.patch"
+	"${FILESDIR}/cpupower-5.4-gcc-10.patch"
 )
 
 S="${WORKDIR}/linux-${PV}"
diff --git a/sys-power/cpupower/files/cpupower-5.4-gcc-10.patch b/sys-power/cpupower/files/cpupower-5.4-gcc-10.patch
new file mode 100644
index 000000000000..56540d2bc562
--- /dev/null
+++ b/sys-power/cpupower/files/cpupower-5.4-gcc-10.patch
@@ -0,0 +1,57 @@
+From 8db4ea3227554fb80ad766936a4c21cc901beb29 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Sat, 1 Feb 2020 12:44:30 -0500
+Subject: [PATCH] cpupower: avoid multiple definition with gcc -fno-common
+
+The -fno-common option will be enabled by default in GCC 10.
+
+Bug: https://bugs.gentoo.org/707462
+Signed-off-by: Mike Gilbert <floppym@gentoo.org>
+---
+ tools/power/cpupower/utils/idle_monitor/amd_fam14h_idle.c  | 2 +-
+ tools/power/cpupower/utils/idle_monitor/cpupower-monitor.c | 2 ++
+ tools/power/cpupower/utils/idle_monitor/cpupower-monitor.h | 2 +-
+ 3 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/tools/power/cpupower/utils/idle_monitor/amd_fam14h_idle.c b/tools/power/cpupower/utils/idle_monitor/amd_fam14h_idle.c
+index 33dc34db4f3c..1b69f25a1281 100644
+--- a/tools/power/cpupower/utils/idle_monitor/amd_fam14h_idle.c
++++ b/tools/power/cpupower/utils/idle_monitor/amd_fam14h_idle.c
+@@ -82,7 +82,7 @@ static struct pci_access *pci_acc;
+ static struct pci_dev *amd_fam14h_pci_dev;
+ static int nbp1_entered;
+ 
+-struct timespec start_time;
++extern struct timespec start_time;
+ static unsigned long long timediff;
+ 
+ #ifdef DEBUG
+diff --git a/tools/power/cpupower/utils/idle_monitor/cpupower-monitor.c b/tools/power/cpupower/utils/idle_monitor/cpupower-monitor.c
+index 6d44fec55ad5..7c77045fef52 100644
+--- a/tools/power/cpupower/utils/idle_monitor/cpupower-monitor.c
++++ b/tools/power/cpupower/utils/idle_monitor/cpupower-monitor.c
+@@ -27,6 +27,8 @@ struct cpuidle_monitor *all_monitors[] = {
+ 0
+ };
+ 
++int cpu_count;
++
+ static struct cpuidle_monitor *monitors[MONITORS_MAX];
+ static unsigned int avail_monitors;
+ 
+diff --git a/tools/power/cpupower/utils/idle_monitor/cpupower-monitor.h b/tools/power/cpupower/utils/idle_monitor/cpupower-monitor.h
+index 5b5eb1da0cce..c559d3115330 100644
+--- a/tools/power/cpupower/utils/idle_monitor/cpupower-monitor.h
++++ b/tools/power/cpupower/utils/idle_monitor/cpupower-monitor.h
+@@ -25,7 +25,7 @@
+ #endif
+ #define CSTATE_DESC_LEN 60
+ 
+-int cpu_count;
++extern int cpu_count;
+ 
+ /* Hard to define the right names ...: */
+ enum power_range_e {
+-- 
+2.25.0
+