gentoo resync : 29.12.2022

3 files changed, 6 insertions, 67 deletions

diff --git a/sys-power/cpupower/Manifest b/sys-power/cpupower/Manifest
index 803cec809bee..cec77052dc81 100644
--- a/sys-power/cpupower/Manifest
+++ b/sys-power/cpupower/Manifest
@@ -1,11 +1,10 @@
 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 linux-5.12.tar.xz 118112412 BLAKE2B 842d921b9a73d2aaade763dbd2ec67bdfe0275baa6d628b775f5c87574ad7dc86f0419afcd48c10c1235f4bffa16084243f2cf4556e6afcd391e975fe8ba530b SHA512 be03b6fee1d1ea8087b09874d27c0a602c0b04fd90ad38b975bd2c8455a07e83c29b56814aaf1389e82305fae0e4c2d1701075a7f0a7295dd28149f967ec5b3d
-DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
+DIST linux-5.18.tar.xz 129790264 BLAKE2B e2745a69eb70169e90505a9318a3993046eab3020496eecde7d8352ecda0eb71a25b21becf7ce93fc593507dce7d1cd61b94ddcdf82b3094d79c0d3d48508eeb SHA512 dbbc9d1395898a498fa4947fceda1781344fa5d360240f753810daa4fa88e519833e2186c4e582a8f1836e6413e9e85f6563c7770523b704e8702d67622f98b5
 EBUILD cpupower-5.12.ebuild 1667 BLAKE2B 224f33c75a713c6ba64e75c58ebbeb61c76ea939ab3866f33924f7cb566f72aad23d95867d608d479f8d77202672b9e3818b39f28e284aa5c34f99715d590df3 SHA512 be528414367bcf6a3d38edd2b1df17bb637a03af03fd56b708961c3c013ecebcfeab327eb96cd36dccbb4892975f9b206a242d47a7caeaac9501b0c0f1492617
-EBUILD cpupower-5.4.ebuild 1708 BLAKE2B f4c31b98b98ffd07398ba6cc4c392fca3e07fd66fbe62fca312b3d8914fb6e67b6ff4e671c4213a2507f4e332f0b982d273d0c66eaf7f09fc7c0fed862b949f6 SHA512 7c2b8fe451477001a41403f065a069fe85ffdd945198ccaaf7a4193669e78ad27da1908adad114d8dce3d47825031e20e2cd7b40136e00b6a5050f2527442d64
+EBUILD cpupower-5.18.ebuild 1669 BLAKE2B 49c2a60db3ef5d8ae11d6b995864299765968ca5b0d585038c7f290a7cf48c33dde9aaceec60bc90cdb8d48bffc7088f485f9bc55a2921a51cfc6aacd0aa146f SHA512 b9106b7d9aeb367774cf2c945956be3e892014da54bac607fade8e51a12a8e3ddca45f30a31789ef0226c93b5079b1f6232ebf28b0657d312d8c3751a7ca391c
 MISC metadata.xml 341 BLAKE2B ca3076a5e7ee2e834df8f12474fc7bf22bfdbcc8b2734760d2dc30977157dc97e4a0201a6946051fb487833d8891085682d3432c4e941f5ba0241b6fc49232f4 SHA512 a5db2151ec0dd4c0d084f64455406b27387058d61efe53d32718072dac198c0a877618b17350e95a4ae31fa65b672cd4b2f6a966ebe61ec5ec9fe2f6677a0311
diff --git a/sys-power/cpupower/cpupower-5.4.ebuild b/sys-power/cpupower/cpupower-5.18.ebuild
index 821253b9a1fe..c9b2a660a015 100644
--- a/sys-power/cpupower/cpupower-5.4.ebuild
+++ b/sys-power/cpupower/cpupower-5.18.ebuild
@@ -1,7 +1,7 @@
-# Copyright 2013-2021 Gentoo Authors
+# Copyright 2013-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit systemd toolchain-funcs
 
@@ -11,7 +11,7 @@ SRC_URI="https://cdn.kernel.org/pub/linux/kernel/v${PV%%.*}.x/linux-${PV}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0/0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
 IUSE="nls"
 
 # File collision w/ headers of the deprecated cpufrequtils
@@ -22,7 +22,6 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
 	"${FILESDIR}/cpupower-5.4-cflags.patch"
-	"${FILESDIR}/cpupower-5.4-gcc-10.patch"
 )
 
 S="${WORKDIR}/linux-${PV}"
@@ -48,9 +47,7 @@ src_compile() {
 		LD="$(tc-getCC)"
 		VERSION=${PV}
 	)
-
-	cd tools/power/cpupower || die
-	emake "${myemakeargs[@]}"
+	emake -C tools/power/cpupower "${myemakeargs[@]}"
 }
 
 src_install() {
diff --git a/sys-power/cpupower/files/cpupower-5.4-gcc-10.patch b/sys-power/cpupower/files/cpupower-5.4-gcc-10.patch
deleted file mode 100644
index 56540d2bc562..000000000000
--- a/sys-power/cpupower/files/cpupower-5.4-gcc-10.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-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
-