gentoo resync : 29.12.2022

44 files changed, 129 insertions, 106 deletions

diff --git a/metadata/md5-cache/sys-power/Manifest.gz b/metadata/md5-cache/sys-power/Manifest.gz
index 414b1eda1258..b4ff9f2269c8 100644
--- a/metadata/md5-cache/sys-power/Manifest.gz
+++ b/metadata/md5-cache/sys-power/Manifest.gz
diff --git a/metadata/md5-cache/sys-power/RyzenAdj-0.8.2-r1 b/metadata/md5-cache/sys-power/RyzenAdj-0.8.2-r1
index 96af574286f6..4536dfa01681 100644
--- a/metadata/md5-cache/sys-power/RyzenAdj-0.8.2-r1
+++ b/metadata/md5-cache/sys-power/RyzenAdj-0.8.2-r1
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=sys-apps/pciutils
 DESCRIPTION=The power management tool for mobile and desktop Ryzen APUs
@@ -10,5 +10,5 @@ LICENSE=LGPL-3
 RDEPEND=sys-apps/pciutils
 SLOT=0
 SRC_URI=https://github.com/FlyGoat/RyzenAdj/archive/refs/tags/v0.8.2.tar.gz -> RyzenAdj-0.8.2.tar.gz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=c4644b58f6453a65b8aeecd3e4223b82
diff --git a/metadata/md5-cache/sys-power/RyzenAdj-0.8.3 b/metadata/md5-cache/sys-power/RyzenAdj-0.8.3
index 4aacac456fbd..22bba053b201 100644
--- a/metadata/md5-cache/sys-power/RyzenAdj-0.8.3
+++ b/metadata/md5-cache/sys-power/RyzenAdj-0.8.3
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=sys-apps/pciutils
 DESCRIPTION=The power management tool for mobile and desktop Ryzen APUs
@@ -10,5 +10,5 @@ LICENSE=LGPL-3
 RDEPEND=sys-apps/pciutils
 SLOT=0
 SRC_URI=https://github.com/FlyGoat/RyzenAdj/archive/refs/tags/v0.8.3.tar.gz -> RyzenAdj-0.8.3.tar.gz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=d86f552423d988506958f1fb50054326
diff --git a/metadata/md5-cache/sys-power/acpi_call-1.2.2 b/metadata/md5-cache/sys-power/acpi_call-1.2.2
index fdd0cee1512c..5bee91299bbc 100644
--- a/metadata/md5-cache/sys-power/acpi_call-1.2.2
+++ b/metadata/md5-cache/sys-power/acpi_call-1.2.2
@@ -3,11 +3,12 @@ DEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:=
 DESCRIPTION=A linux kernel module that enables calls to ACPI
 EAPI=7
 HOMEPAGE=https://github.com/nix-community/acpi_call
+INHERIT=linux-info linux-mod
 IUSE=examples dist-kernel
 KEYWORDS=amd64
 LICENSE=GPL-3+
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=https://github.com/nix-community/acpi_call/archive/v1.2.2.tar.gz -> acpi_call-1.2.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	3cfb791b045bfb6773a6d0f2d80ce9fd	linux-mod	7d55f157d3072c067c44b09dac80bdf2	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	linux-mod	6ff232574f0bcad33767903505553e8d	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=a59142345a0c4170a6e5bf87144b38e0
diff --git a/metadata/md5-cache/sys-power/acpi_call-9999 b/metadata/md5-cache/sys-power/acpi_call-9999
index 52ee265087da..2f572e12182e 100644
--- a/metadata/md5-cache/sys-power/acpi_call-9999
+++ b/metadata/md5-cache/sys-power/acpi_call-9999
@@ -4,10 +4,11 @@ DEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:=
 DESCRIPTION=A linux kernel module that enables calls to ACPI
 EAPI=7
 HOMEPAGE=https://github.com/nix-community/acpi_call
+INHERIT=git-r3 linux-info linux-mod
 IUSE=examples dist-kernel
 LICENSE=GPL-3+
 PROPERTIES=live
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	linux-info	3cfb791b045bfb6773a6d0f2d80ce9fd	linux-mod	7d55f157d3072c067c44b09dac80bdf2	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	linux-mod	6ff232574f0bcad33767903505553e8d	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=44f3263fe4c9b633d47006925fbb1dbf
diff --git a/metadata/md5-cache/sys-power/acpid-2.0.32-r2 b/metadata/md5-cache/sys-power/acpid-2.0.32-r2
index 4240282c7e65..da41ca8e801a 100644
--- a/metadata/md5-cache/sys-power/acpid-2.0.32-r2
+++ b/metadata/md5-cache/sys-power/acpid-2.0.32-r2
@@ -3,11 +3,12 @@ DEPEND=>=sys-kernel/linux-headers-3 virtual/pkgconfig
 DESCRIPTION=Daemon for Advanced Configuration and Power Interface
 EAPI=6
 HOMEPAGE=https://sourceforge.net/projects/acpid2
+INHERIT=linux-info systemd
 IUSE=selinux
 KEYWORDS=amd64 ~arm arm64 ~ia64 ~riscv x86
 LICENSE=GPL-2
 RDEPEND=selinux? ( sec-policy/selinux-apm )
 SLOT=0
 SRC_URI=mirror://sourceforge/acpid2/acpid-2.0.32.tar.xz https://dev.gentoo.org/~andrey_utkin/distfiles/sys-power_acpid_2.0.32-r2_extras.tar.xz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	linux-info	3cfb791b045bfb6773a6d0f2d80ce9fd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	4fbbbc98f236f1b43acd99476bc3cd85	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=7c758e9404c2dcf84e62e675a1b2a318
diff --git a/metadata/md5-cache/sys-power/acpid-2.0.33 b/metadata/md5-cache/sys-power/acpid-2.0.33
index 2332688ee32c..0c1398ba4bc4 100644
--- a/metadata/md5-cache/sys-power/acpid-2.0.33
+++ b/metadata/md5-cache/sys-power/acpid-2.0.33
@@ -4,11 +4,12 @@ DEPEND=>=sys-kernel/linux-headers-3
 DESCRIPTION=Daemon for Advanced Configuration and Power Interface
 EAPI=8
 HOMEPAGE=https://sourceforge.net/projects/acpid2/
+INHERIT=linux-info systemd
 IUSE=selinux
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~riscv ~x86
+KEYWORDS=~amd64 ~arm arm64 ~ia64 ~loong ~riscv ~x86
 LICENSE=GPL-2
 RDEPEND=selinux? ( sec-policy/selinux-apm )
 SLOT=0
 SRC_URI=mirror://sourceforge/acpid2/acpid-2.0.33.tar.xz
-_eclasses_=linux-info	3cfb791b045bfb6773a6d0f2d80ce9fd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=db403e07f6d0aa8ff2bd887676f291a9
+_eclasses_=linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	4fbbbc98f236f1b43acd99476bc3cd85	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=97a1b5233a9a3e65b10c7d1330efc624
diff --git a/metadata/md5-cache/sys-power/acpilight-1.2-r3 b/metadata/md5-cache/sys-power/acpilight-1.2-r3
deleted file mode 100644
index 76995b1f9932..000000000000
--- a/metadata/md5-cache/sys-power/acpilight-1.2-r3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile install postinst setup
-DESCRIPTION=Replacement for xbacklight that uses the ACPI interface to set brightness
-EAPI=7
-HOMEPAGE=https://gitlab.com/wavexx/acpilight/
-INHERIT=python-single-r1 udev
-IUSE=python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=amd64 x86
-LICENSE=GPL-3+
-RDEPEND=virtual/udev acct-group/video !dev-libs/light python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) !x11-apps/xbacklight
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
-SLOT=0
-SRC_URI=https://gitlab.com/wavexx/acpilight/-/archive/v1.2/acpilight-v1.2.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	udev	2d229ad4bfa09058e0184b1ca900db32
-_md5_=2ca5040d09a6ab6cc7b1d3c4884d1ed5
diff --git a/metadata/md5-cache/sys-power/acpilight-1.2-r4 b/metadata/md5-cache/sys-power/acpilight-1.2-r4
index 1450a30b103d..147b50566a5d 100644
--- a/metadata/md5-cache/sys-power/acpilight-1.2-r4
+++ b/metadata/md5-cache/sys-power/acpilight-1.2-r4
@@ -1,15 +1,15 @@
 BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile install postinst setup
+DEFINED_PHASES=compile install postinst postrm setup
 DESCRIPTION=Replacement for xbacklight that uses the ACPI interface to set brightness
 EAPI=7
 HOMEPAGE=https://gitlab.com/wavexx/acpilight/
 INHERIT=python-single-r1 udev
 IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3+
 RDEPEND=virtual/udev acct-group/video !dev-libs/light python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) !x11-apps/xbacklight
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 SLOT=0
 SRC_URI=https://gitlab.com/wavexx/acpilight/-/archive/v1.2/acpilight-v1.2.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	udev	2d229ad4bfa09058e0184b1ca900db32
-_md5_=72ace9007cb1f998cbec16efd78ed216
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	udev	f3a0a3964e2028a140c181f00eea9712
+_md5_=5705d2a9702f7f39b8d361fd7cfc0360
diff --git a/metadata/md5-cache/sys-power/apcupsd-3.14.14-r3 b/metadata/md5-cache/sys-power/apcupsd-3.14.14-r3
index aaef64b228b0..9463564d36ce 100644
--- a/metadata/md5-cache/sys-power/apcupsd-3.14.14-r3
+++ b/metadata/md5-cache/sys-power/apcupsd-3.14.14-r3
@@ -4,11 +4,12 @@ DEPEND=>=sys-apps/util-linux-2.23[tty-helpers(-)] cgi? ( >=media-libs/gd-1.8.4 )
 DESCRIPTION=APC UPS daemon with integrated tcp/ip remote shutdown
 EAPI=7
 HOMEPAGE=http://www.apcupsd.org/
+INHERIT=linux-info systemd udev tmpfiles
 IUSE=snmp +usb +modbus cgi gnome
 KEYWORDS=amd64 ~arm ~arm64 ppc ~riscv x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/util-linux-2.23[tty-helpers(-)] cgi? ( >=media-libs/gd-1.8.4 ) modbus? ( usb? ( virtual/libusb:0 ) ) gnome? ( >=x11-libs/gtk+-2.4.0:2 dev-libs/glib:2 >=gnome-base/gconf-2.0 ) snmp? ( >=net-analyzer/net-snmp-5.7.2 ) virtual/mailx virtual/tmpfiles
 SLOT=0
 SRC_URI=mirror://sourceforge/apcupsd/apcupsd-3.14.14.tar.gz
-_eclasses_=linux-info	3cfb791b045bfb6773a6d0f2d80ce9fd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	udev	2d229ad4bfa09058e0184b1ca900db32
-_md5_=ecf652f5d4c897cbcf09f94bf7f6b8a4
+_eclasses_=linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	4fbbbc98f236f1b43acd99476bc3cd85	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	udev	f3a0a3964e2028a140c181f00eea9712
+_md5_=cdd186247a5283921a6adb8e8f3905ae
diff --git a/metadata/md5-cache/sys-power/athcool-0.3.12 b/metadata/md5-cache/sys-power/athcool-0.3.12
index 494812365840..5a279e75eccf 100644
--- a/metadata/md5-cache/sys-power/athcool-0.3.12
+++ b/metadata/md5-cache/sys-power/athcool-0.3.12
@@ -3,9 +3,10 @@ DEPEND=sys-apps/pciutils
 DESCRIPTION=small utility to toggle Powersaving mode for AMD Athlon/Duron processors
 EAPI=7
 HOMEPAGE=http://members.jcom.home.ne.jp/jacobi/linux/softwares.html#athcool
+INHERIT=toolchain-funcs
 KEYWORDS=-* x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://members.jcom.home.ne.jp/jacobi/linux/files/athcool-0.3.12.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=db7765957317649fe08a5aa630426a2d
diff --git a/metadata/md5-cache/sys-power/bbswitch-0.8_p20200526 b/metadata/md5-cache/sys-power/bbswitch-0.8_p20200526
deleted file mode 100644
index 023dfea88bc3..000000000000
--- a/metadata/md5-cache/sys-power/bbswitch-0.8_p20200526
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-DEPEND=virtual/linux-sources sys-kernel/linux-headers kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
-DESCRIPTION=Toggle discrete NVIDIA Optimus graphics card
-EAPI=7
-HOMEPAGE=https://github.com/Bumblebee-Project/bbswitch
-IUSE=dist-kernel
-KEYWORDS=amd64 x86
-LICENSE=GPL-3+
-RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
-SLOT=0
-SRC_URI=https://github.com/Bumblebee-Project/bbswitch/archive/ddbd243638c7bc2baecf43a78aff46cdc12e9b2e.tar.gz -> bbswitch-0.8_p20200526.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	3cfb791b045bfb6773a6d0f2d80ce9fd	linux-mod	7d55f157d3072c067c44b09dac80bdf2	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=83172471fbb2d9c15ea63006f98b8c6a
diff --git a/metadata/md5-cache/sys-power/bbswitch-0.8_p20211129 b/metadata/md5-cache/sys-power/bbswitch-0.8_p20211129
index 0b9d5eab94a4..e82a5c2dde47 100644
--- a/metadata/md5-cache/sys-power/bbswitch-0.8_p20211129
+++ b/metadata/md5-cache/sys-power/bbswitch-0.8_p20211129
@@ -1,13 +1,14 @@
 DEFINED_PHASES=compile install postinst postrm preinst prepare setup
 DEPEND=virtual/linux-sources sys-kernel/linux-headers kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
 DESCRIPTION=Toggle discrete NVIDIA Optimus graphics card
-EAPI=7
+EAPI=8
 HOMEPAGE=https://github.com/Bumblebee-Project/bbswitch
+INHERIT=linux-mod toolchain-funcs
 IUSE=dist-kernel
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3+
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=https://github.com/Bumblebee-Project/bbswitch/archive/23891174a80ea79c7720bcc7048a5c2bfcde5cd9.tar.gz -> bbswitch-0.8_p20211129.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	3cfb791b045bfb6773a6d0f2d80ce9fd	linux-mod	7d55f157d3072c067c44b09dac80bdf2	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=1331e5f7442fe9eaef6f3f49aa16f36f
+_eclasses_=linux-info	dcbf4f67bc38bee48e9d69a4344e8059	linux-mod	6ff232574f0bcad33767903505553e8d	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=15155a7919a51f01ecc835fbd704af0e
diff --git a/metadata/md5-cache/sys-power/bbswitch-9999 b/metadata/md5-cache/sys-power/bbswitch-9999
deleted file mode 100644
index f9ec1363d35f..000000000000
--- a/metadata/md5-cache/sys-power/bbswitch-9999
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup unpack
-DEPEND=virtual/linux-sources sys-kernel/linux-headers kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
-DESCRIPTION=Toggle discrete NVIDIA Optimus graphics card
-EAPI=7
-HOMEPAGE=https://github.com/Bumblebee-Project/bbswitch
-IUSE=dist-kernel
-LICENSE=GPL-3+
-PROPERTIES=live
-RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
-SLOT=0
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	linux-info	3cfb791b045bfb6773a6d0f2d80ce9fd	linux-mod	7d55f157d3072c067c44b09dac80bdf2	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=8ccdbf62c0054a7eaf09de8b1e3c618b
diff --git a/metadata/md5-cache/sys-power/cpupower-5.12 b/metadata/md5-cache/sys-power/cpupower-5.12
index 73bfa7123d93..6caf20a49b0b 100644
--- a/metadata/md5-cache/sys-power/cpupower-5.12
+++ b/metadata/md5-cache/sys-power/cpupower-5.12
@@ -4,11 +4,12 @@ DEPEND=sys-apps/pciutils virtual/os-headers nls? ( sys-devel/gettext )
 DESCRIPTION=Shows and sets processor power related values
 EAPI=7
 HOMEPAGE=https://www.kernel.org/
+INHERIT=systemd toolchain-funcs
 IUSE=nls
 KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~riscv x86
 LICENSE=GPL-2
 RDEPEND=sys-apps/pciutils
 SLOT=0/0
 SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.12.tar.xz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=9941787eabcd93c8d98b049b20fbe9e1
diff --git a/metadata/md5-cache/sys-power/cpupower-5.18 b/metadata/md5-cache/sys-power/cpupower-5.18
new file mode 100644
index 000000000000..f603615a0bf3
--- /dev/null
+++ b/metadata/md5-cache/sys-power/cpupower-5.18
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile configure install
+DEPEND=sys-apps/pciutils virtual/os-headers nls? ( sys-devel/gettext )
+DESCRIPTION=Shows and sets processor power related values
+EAPI=8
+HOMEPAGE=https://www.kernel.org/
+INHERIT=systemd toolchain-funcs
+IUSE=nls
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+RDEPEND=sys-apps/pciutils
+SLOT=0/0
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.18.tar.xz
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=3e2d784f835db66d9e29abb58e8909f9
diff --git a/metadata/md5-cache/sys-power/cpupower-5.4 b/metadata/md5-cache/sys-power/cpupower-5.4
deleted file mode 100644
index 11023730188c..000000000000
--- a/metadata/md5-cache/sys-power/cpupower-5.4
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile configure install
-DEPEND=sys-apps/pciutils virtual/os-headers nls? ( sys-devel/gettext )
-DESCRIPTION=Shows and sets processor power related values
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=nls
-KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~riscv x86
-LICENSE=GPL-2
-RDEPEND=sys-apps/pciutils
-SLOT=0/0
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=17650e188413c1c2a13f7083938f1e90
diff --git a/metadata/md5-cache/sys-power/iasl-20200326 b/metadata/md5-cache/sys-power/iasl-20200326
index b75458f45d06..e24cc1c0b1a5 100644
--- a/metadata/md5-cache/sys-power/iasl-20200326
+++ b/metadata/md5-cache/sys-power/iasl-20200326
@@ -3,11 +3,12 @@ DEFINED_PHASES=compile configure install prepare setup test
 DESCRIPTION=Intel ACPI Source Language (ASL) compiler
 EAPI=7
 HOMEPAGE=https://www.acpica.org/downloads/
+INHERIT=edos2unix toolchain-funcs
 IUSE=test
 KEYWORDS=amd64 ~arm64 ppc ppc64 x86
 LICENSE=iASL
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://www.acpica.org/sites/acpica/files/acpica-unix-20200326.tar.gz test? ( http://www.acpica.org/sites/acpica/files/acpitests-unix-20200326.tar.gz )
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=f31da0da321f514c1e7529baf8de5965
diff --git a/metadata/md5-cache/sys-power/iasl-20200717 b/metadata/md5-cache/sys-power/iasl-20200717
index 3d2ec5427998..052d1b5b3554 100644
--- a/metadata/md5-cache/sys-power/iasl-20200717
+++ b/metadata/md5-cache/sys-power/iasl-20200717
@@ -3,11 +3,12 @@ DEFINED_PHASES=compile configure install prepare setup test
 DESCRIPTION=Intel ACPI Source Language (ASL) compiler
 EAPI=7
 HOMEPAGE=https://www.acpica.org/downloads/
+INHERIT=edos2unix toolchain-funcs
 IUSE=test
-KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ppc ppc64 x86
 LICENSE=iASL
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://www.acpica.org/sites/acpica/files/acpica-unix-20200717.tar.gz test? ( http://www.acpica.org/sites/acpica/files/acpitests-unix-20200717.tar.gz )
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=d53efbb1ed7e28fb8180dcff3afe4cf8
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=f31da0da321f514c1e7529baf8de5965
diff --git a/metadata/md5-cache/sys-power/intel-undervolt-1.7-r1 b/metadata/md5-cache/sys-power/intel-undervolt-1.7-r1
index fbf6b5cd7a11..0ad3591dd8bd 100644
--- a/metadata/md5-cache/sys-power/intel-undervolt-1.7-r1
+++ b/metadata/md5-cache/sys-power/intel-undervolt-1.7-r1
@@ -4,11 +4,12 @@ DEPEND=elogind? ( sys-auth/elogind )
 DESCRIPTION=Intel CPU undervolting and throttling configuration tool
 EAPI=7
 HOMEPAGE=https://github.com/kitsunyan/intel-undervolt
+INHERIT=linux-info systemd toolchain-funcs
 IUSE=elogind
 KEYWORDS=-* ~amd64
 LICENSE=GPL-3
 RDEPEND=elogind? ( sys-auth/elogind )
 SLOT=0
 SRC_URI=https://github.com/kitsunyan/intel-undervolt/archive/1.7.tar.gz -> intel-undervolt-1.7.tar.gz
-_eclasses_=linux-info	3cfb791b045bfb6773a6d0f2d80ce9fd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	4fbbbc98f236f1b43acd99476bc3cd85	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=01b51b5f7814703aca3c4ad6625057cc
diff --git a/metadata/md5-cache/sys-power/intel-undervolt-9999 b/metadata/md5-cache/sys-power/intel-undervolt-9999
index 211b376c7c4d..3093c1f1e2c7 100644
--- a/metadata/md5-cache/sys-power/intel-undervolt-9999
+++ b/metadata/md5-cache/sys-power/intel-undervolt-9999
@@ -4,10 +4,11 @@ DEPEND=elogind? ( sys-auth/elogind )
 DESCRIPTION=Intel CPU undervolting and throttling configuration tool
 EAPI=7
 HOMEPAGE=https://github.com/kitsunyan/intel-undervolt
+INHERIT=linux-info systemd toolchain-funcs git-r3
 IUSE=elogind
 LICENSE=GPL-3
 PROPERTIES=live
 RDEPEND=elogind? ( sys-auth/elogind )
 SLOT=0
-_eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	linux-info	3cfb791b045bfb6773a6d0f2d80ce9fd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	4fbbbc98f236f1b43acd99476bc3cd85	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=01b51b5f7814703aca3c4ad6625057cc
diff --git a/metadata/md5-cache/sys-power/nut-2.7.4-r8 b/metadata/md5-cache/sys-power/nut-2.7.4-r8
index 6a064b315c0a..754c910b833e 100644
--- a/metadata/md5-cache/sys-power/nut-2.7.4-r8
+++ b/metadata/md5-cache/sys-power/nut-2.7.4-r8
@@ -4,12 +4,13 @@ DEPEND=dev-libs/libltdl net-libs/libnsl:= virtual/udev cgi? ( >=media-libs/gd-2[
 DESCRIPTION=Network-UPS Tools
 EAPI=7
 HOMEPAGE=https://www.networkupstools.org/
+INHERIT=autotools bash-completion-r1 desktop fixheadtails flag-o-matic systemd toolchain-funcs
 IUSE=cgi ipmi snmp +usb selinux split-usr ssl tcpd xml zeroconf +ups_drivers_al175 +ups_drivers_bcmxcp +ups_drivers_belkin +ups_drivers_belkinunv +ups_drivers_bestfcom +ups_drivers_bestfortress +ups_drivers_bestuferrups +ups_drivers_bestups +ups_drivers_dummy-ups +ups_drivers_etapro +ups_drivers_everups +ups_drivers_gamatronic +ups_drivers_genericups +ups_drivers_isbmex +ups_drivers_liebert +ups_drivers_liebert-esp2 +ups_drivers_masterguard +ups_drivers_metasys +ups_drivers_oldmge-shut +ups_drivers_mge-utalk +ups_drivers_microdowell +ups_drivers_mge-shut +ups_drivers_oneac +ups_drivers_optiups +ups_drivers_powercom +ups_drivers_rhino +ups_drivers_safenet +ups_drivers_solis +ups_drivers_tripplite +ups_drivers_tripplitesu +ups_drivers_upscode2 +ups_drivers_victronups +ups_drivers_powerpanel +ups_drivers_blazer_ser +ups_drivers_clone +ups_drivers_clone-outlet +ups_drivers_ivtscd +ups_drivers_apcsmart +ups_drivers_apcsmart-old +ups_drivers_apcupsd-ups +ups_drivers_riello_ser +ups_drivers_nutdrv_qx +ups_drivers_usbhid-ups +ups_drivers_bcmxcp_usb +ups_drivers_tripplite_usb +ups_drivers_blazer_usb +ups_drivers_richcomm_usb +ups_drivers_riello_usb +ups_drivers_nutdrv_qx ups_drivers_netxml-ups ups_drivers_snmp-ups ups_drivers_nut-ipmipsu
-KEYWORDS=amd64 arm ~ppc ppc64 ~riscv x86
+KEYWORDS=amd64 arm ~arm64 ~ppc ppc64 ~riscv x86
 LICENSE=GPL-2
 RDEPEND=acct-group/nut acct-user/nut dev-libs/libltdl net-libs/libnsl:= virtual/udev cgi? ( >=media-libs/gd-2[png] ) ipmi? ( sys-libs/freeipmi ) snmp? ( net-analyzer/net-snmp:= ) ssl? ( >=dev-libs/openssl-1:= ) tcpd? ( sys-apps/tcp-wrappers ) usb? ( virtual/libusb:0= ) xml? ( >=net-libs/neon-0.25.0:= ) zeroconf? ( net-dns/avahi ) selinux? ( sec-policy/selinux-nut )
 REQUIRED_USE=ups_drivers_usbhid-ups? ( usb ) ups_drivers_bcmxcp_usb? ( usb ) ups_drivers_tripplite_usb? ( usb ) ups_drivers_blazer_usb? ( usb ) ups_drivers_richcomm_usb? ( usb ) ups_drivers_riello_usb? ( usb ) ups_drivers_nutdrv_qx? ( usb ) ups_drivers_netxml-ups? ( xml ) ups_drivers_snmp-ups? ( snmp ) ups_drivers_nut-ipmipsu? ( ipmi )
 SLOT=0
 SRC_URI=https://networkupstools.org/source/2.7/nut-2.7.4.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fixheadtails	1721997ed44d035654efe12da50797ef	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=5bac3668c2237fc1d811814095cbf104
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fixheadtails	1721997ed44d035654efe12da50797ef	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=0ae7c1b3712d7e85f29f758342edbbdf
diff --git a/metadata/md5-cache/sys-power/nvclock-0.8_p20110102-r2 b/metadata/md5-cache/sys-power/nvclock-0.8_p20110102-r2
index 430fff76342e..f565905a8617 100644
--- a/metadata/md5-cache/sys-power/nvclock-0.8_p20110102-r2
+++ b/metadata/md5-cache/sys-power/nvclock-0.8_p20110102-r2
@@ -4,11 +4,12 @@ DEPEND=gtk? ( x11-libs/gtk+:2 x11-libs/libX11 ) nvcontrol? ( x11-libs/libX11 x11
 DESCRIPTION=NVIDIA Overclocking Utility
 EAPI=7
 HOMEPAGE=http://www.linuxhardware.org/nvclock/
+INHERIT=autotools
 IUSE=gtk nvcontrol
 KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
 RDEPEND=gtk? ( x11-libs/gtk+:2 x11-libs/libX11 ) nvcontrol? ( x11-libs/libX11 x11-libs/libXext )
 SLOT=0
 SRC_URI=mirror://gentoo/nvclock-0.8_p20110102.tar.bz2
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=6b03cffcce573e215c5c96b681fd5c2a
diff --git a/metadata/md5-cache/sys-power/nvclock-0.8_p20110102-r3 b/metadata/md5-cache/sys-power/nvclock-0.8_p20110102-r3
index 5d5194212dae..9590e3b4cf5f 100644
--- a/metadata/md5-cache/sys-power/nvclock-0.8_p20110102-r3
+++ b/metadata/md5-cache/sys-power/nvclock-0.8_p20110102-r3
@@ -4,11 +4,12 @@ DEPEND=gtk? ( x11-libs/gtk+:2 x11-libs/libX11 ) nvcontrol? ( x11-libs/libX11 x11
 DESCRIPTION=NVIDIA Overclocking Utility
 EAPI=7
 HOMEPAGE=http://www.linuxhardware.org/nvclock/
+INHERIT=autotools
 IUSE=gtk nvcontrol
 KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=gtk? ( x11-libs/gtk+:2 x11-libs/libX11 ) nvcontrol? ( x11-libs/libX11 x11-libs/libXext )
 SLOT=0
 SRC_URI=mirror://gentoo/nvclock-0.8_p20110102.tar.bz2
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=546093fd3c71b1cf99209d7a59ad7716
diff --git a/metadata/md5-cache/sys-power/pmtools-20110323-r1 b/metadata/md5-cache/sys-power/pmtools-20110323-r1
index 877679184a95..ba43daf4c239 100644
--- a/metadata/md5-cache/sys-power/pmtools-20110323-r1
+++ b/metadata/md5-cache/sys-power/pmtools-20110323-r1
@@ -2,11 +2,12 @@ DEFINED_PHASES=compile install postinst prepare
 DESCRIPTION=Collection of tools for ACPI and power management
 EAPI=8
 HOMEPAGE=https://github.com/anyc/pmtools/
+INHERIT=flag-o-matic toolchain-funcs
 IUSE=doc
 KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl >=sys-power/iasl-20090521
 SLOT=0
 SRC_URI=https://github.com/anyc/pmtools/tarball/20110323 -> pmtools-20110323.tar.gz
-_eclasses_=flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=ac1ae06a26de097acbc5e78a7028dc25
diff --git a/metadata/md5-cache/sys-power/powermgmt-base-1.31-r2 b/metadata/md5-cache/sys-power/powermgmt-base-1.31-r2
index 5d6b7fd0c033..731d76172cab 100644
--- a/metadata/md5-cache/sys-power/powermgmt-base-1.31-r2
+++ b/metadata/md5-cache/sys-power/powermgmt-base-1.31-r2
@@ -3,10 +3,11 @@ DEPEND=virtual/awk sys-apps/grep sys-apps/kmod[tools]
 DESCRIPTION=Script to test whether computer is running on AC power
 EAPI=7
 HOMEPAGE=http://packages.debian.org/testing/utils/powermgmt-base
+INHERIT=toolchain-funcs
 KEYWORDS=amd64 arm ~ia64 ppc ppc64 x86
 LICENSE=GPL-2
 RDEPEND=virtual/awk sys-apps/grep sys-apps/kmod[tools]
 SLOT=0
 SRC_URI=mirror://debian/pool/main/p/powermgmt-base/powermgmt-base_1.31.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=b9d225f5ea337a939daad04ffe8d3a42
diff --git a/metadata/md5-cache/sys-power/powernowd-1.00-r5 b/metadata/md5-cache/sys-power/powernowd-1.00-r5
index 38a4506a7ce8..744ea194b660 100644
--- a/metadata/md5-cache/sys-power/powernowd-1.00-r5
+++ b/metadata/md5-cache/sys-power/powernowd-1.00-r5
@@ -3,9 +3,10 @@ DEPEND=virtual/pkgconfig
 DESCRIPTION=Daemon to control the speed and voltage of CPUs
 EAPI=6
 HOMEPAGE=http://www.deater.net/john/powernowd.html https://github.com/clemej/powernowd
+INHERIT=linux-info systemd toolchain-funcs
 KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.deater.net/john/powernowd-1.00.tar.gz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	linux-info	3cfb791b045bfb6773a6d0f2d80ce9fd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	4fbbbc98f236f1b43acd99476bc3cd85	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=525c3102d0276060fa835a8608206f58
diff --git a/metadata/md5-cache/sys-power/powerstat-0.02.21 b/metadata/md5-cache/sys-power/powerstat-0.02.21
index 41cda63fa013..78faf85de536 100644
--- a/metadata/md5-cache/sys-power/powerstat-0.02.21
+++ b/metadata/md5-cache/sys-power/powerstat-0.02.21
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile
 DESCRIPTION=Laptop power measuring tool
 EAPI=7
 HOMEPAGE=https://launchpad.net/ubuntu/+source/powerstat https://github.com/ColinIanKing/powerstat
+INHERIT=toolchain-funcs
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=https://github.com/ColinIanKing/powerstat/archive/V0.02.21.tar.gz -> powerstat-0.02.21.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=2edfecafd89f66212ddd7f2659f7977a
diff --git a/metadata/md5-cache/sys-power/powerstat-0.02.22 b/metadata/md5-cache/sys-power/powerstat-0.02.22
index 0d34dcb98f9b..5d08dd04392f 100644
--- a/metadata/md5-cache/sys-power/powerstat-0.02.22
+++ b/metadata/md5-cache/sys-power/powerstat-0.02.22
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile prepare
 DESCRIPTION=Laptop power measuring tool
 EAPI=7
 HOMEPAGE=https://launchpad.net/ubuntu/+source/powerstat https://github.com/ColinIanKing/powerstat
+INHERIT=toolchain-funcs
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=https://github.com/ColinIanKing/powerstat/archive/V0.02.22.tar.gz -> powerstat-0.02.22.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=aab479cfd4e9d8ce0d68fb2d3dd9c489
diff --git a/metadata/md5-cache/sys-power/powerstat-9999 b/metadata/md5-cache/sys-power/powerstat-9999
index d99aafb5b926..25749ab6f889 100644
--- a/metadata/md5-cache/sys-power/powerstat-9999
+++ b/metadata/md5-cache/sys-power/powerstat-9999
@@ -3,8 +3,9 @@ DEFINED_PHASES=compile prepare unpack
 DESCRIPTION=Laptop power measuring tool
 EAPI=7
 HOMEPAGE=https://launchpad.net/ubuntu/+source/powerstat https://github.com/ColinIanKing/powerstat
+INHERIT=git-r3 toolchain-funcs
 LICENSE=GPL-2+
 PROPERTIES=live
 SLOT=0
-_eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=1d7efd3eacd38a48c907c9e9a764e026
diff --git a/metadata/md5-cache/sys-power/powertop-2.14 b/metadata/md5-cache/sys-power/powertop-2.14
index 660dfe4547d9..f0241965c99b 100644
--- a/metadata/md5-cache/sys-power/powertop-2.14
+++ b/metadata/md5-cache/sys-power/powertop-2.14
@@ -4,11 +4,12 @@ DEPEND=dev-libs/libnl:3 sys-apps/pciutils sys-libs/ncurses:=[unicode(+)?]
 DESCRIPTION=tool to diagnose issues with power consumption and power management
 EAPI=7
 HOMEPAGE=https://01.org/powertop/ https://github.com/fenrus75/powertop/
+INHERIT=autotools linux-info
 IUSE=nls unicode X
 KEYWORDS=amd64 arm ~arm64 ppc sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-libs/libnl:3 sys-apps/pciutils sys-libs/ncurses:=[unicode(+)?] X? ( x11-apps/xset ) virtual/libintl
 SLOT=0
 SRC_URI=https://github.com/fenrus75/powertop/archive/v2.14.tar.gz -> powertop-2.14.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	3cfb791b045bfb6773a6d0f2d80ce9fd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=6331ec8dcfd21c7cd725f3781bde3dd6
diff --git a/metadata/md5-cache/sys-power/powertop-9999 b/metadata/md5-cache/sys-power/powertop-9999
index 4b1ac9b17404..e269c723322b 100644
--- a/metadata/md5-cache/sys-power/powertop-9999
+++ b/metadata/md5-cache/sys-power/powertop-9999
@@ -4,10 +4,11 @@ DEPEND=dev-libs/libnl:3 sys-apps/pciutils sys-libs/ncurses:=[unicode(+)?]
 DESCRIPTION=tool to diagnose issues with power consumption and power management
 EAPI=7
 HOMEPAGE=https://01.org/powertop/ https://github.com/fenrus75/powertop/
+INHERIT=autotools git-r3 linux-info
 IUSE=nls unicode X
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=dev-libs/libnl:3 sys-apps/pciutils sys-libs/ncurses:=[unicode(+)?] X? ( x11-apps/xset ) virtual/libintl
 SLOT=0
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	3cfb791b045bfb6773a6d0f2d80ce9fd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=6c27867c56b52711a779d4e82eebeaa3
diff --git a/metadata/md5-cache/sys-power/sispmctl-4.1-r1 b/metadata/md5-cache/sys-power/sispmctl-4.1-r1
index f40f297571a5..9602a71ee17b 100644
--- a/metadata/md5-cache/sys-power/sispmctl-4.1-r1
+++ b/metadata/md5-cache/sys-power/sispmctl-4.1-r1
@@ -4,11 +4,12 @@ DEPEND=virtual/libusb:0
 DESCRIPTION=GEMBIRD SiS-PM control utility
 EAPI=7
 HOMEPAGE=http://sispmctl.sourceforge.net/
+INHERIT=systemd udev
 IUSE=static-libs
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-2
 RDEPEND=virtual/libusb:0 acct-group/sispmctl
 SLOT=0
 SRC_URI=mirror://sourceforge/sispmctl/sispmctl-4.1.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	udev	2d229ad4bfa09058e0184b1ca900db32
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	udev	f3a0a3964e2028a140c181f00eea9712
 _md5_=1ad012c3a4c12e7aad8a218cedaf2e10
diff --git a/metadata/md5-cache/sys-power/suspend-1.0_p20190605 b/metadata/md5-cache/sys-power/suspend-1.0_p20190605
index f73e58f9ce9d..7203abe52b0f 100644
--- a/metadata/md5-cache/sys-power/suspend-1.0_p20190605
+++ b/metadata/md5-cache/sys-power/suspend-1.0_p20190605
@@ -4,11 +4,12 @@ DEPEND=dev-libs/libx86 >=sys-apps/pciutils-2.2.4 crypt? ( >=dev-libs/libgcrypt-1
 DESCRIPTION=Userspace Software Suspend and S2Ram
 EAPI=7
 HOMEPAGE=http://suspend.sourceforge.net https://github.com/bircoph/suspend
+INHERIT=autotools
 IUSE=crypt +lzo threads
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/libx86 >=sys-apps/pciutils-2.2.4 crypt? ( >=dev-libs/libgcrypt-1.6.3:0[static-libs] dev-libs/libgpg-error[static-libs] ) lzo? ( >=dev-libs/lzo-2[static-libs] )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~bircoph/distfiles/suspend-1.0_p20120915.tar.xz https://dev.gentoo.org/~bircoph/patches/suspend-1.0_p20190605.patch.xz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=90534b2462e84160ed677acce97042f0
diff --git a/metadata/md5-cache/sys-power/suspend-1.0_p20200924 b/metadata/md5-cache/sys-power/suspend-1.0_p20200924
index 9296b511e449..9a5593dfec18 100644
--- a/metadata/md5-cache/sys-power/suspend-1.0_p20200924
+++ b/metadata/md5-cache/sys-power/suspend-1.0_p20200924
@@ -4,11 +4,12 @@ DEPEND=dev-libs/libx86 >=sys-apps/pciutils-2.2.4 crypt? ( >=dev-libs/libgcrypt-1
 DESCRIPTION=Userspace Software Suspend and S2Ram
 EAPI=7
 HOMEPAGE=http://suspend.sourceforge.net https://github.com/bircoph/suspend
+INHERIT=autotools
 IUSE=crypt +lzo threads
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/libx86 >=sys-apps/pciutils-2.2.4 crypt? ( >=dev-libs/libgcrypt-1.6.3:0[static-libs] dev-libs/libgpg-error[static-libs] ) lzo? ( >=dev-libs/lzo-2[static-libs] )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~bircoph/distfiles/suspend-1.0_p20120915.tar.xz https://dev.gentoo.org/~bircoph/patches/suspend-1.0_p20200924.patch.xz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=c7fad77387c8a194d7a396228b4430b1
diff --git a/metadata/md5-cache/sys-power/switcheroo-control-2.4 b/metadata/md5-cache/sys-power/switcheroo-control-2.4
index c11399ddb951..a4c7aef3554c 100644
--- a/metadata/md5-cache/sys-power/switcheroo-control-2.4
+++ b/metadata/md5-cache/sys-power/switcheroo-control-2.4
@@ -12,5 +12,5 @@ RDEPEND=>=dev-libs/glib-2.56.0:2 >=dev-libs/libgudev-232:= sys-apps/systemd
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://gitlab.freedesktop.org/hadess/switcheroo-control/uploads/accd4a9492979bfd91b587ae7e18d3a2/switcheroo-control-2.4.tar.xz
-_eclasses_=meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=44b3b19050bde70a10b4d318bae54014
diff --git a/metadata/md5-cache/sys-power/thermald-2.4.8-r1 b/metadata/md5-cache/sys-power/thermald-2.4.8-r1
index b979e2c908fe..aed4ee20698f 100644
--- a/metadata/md5-cache/sys-power/thermald-2.4.8-r1
+++ b/metadata/md5-cache/sys-power/thermald-2.4.8-r1
@@ -4,10 +4,11 @@ DEPEND=dev-libs/dbus-glib:= dev-libs/glib:= dev-libs/libxml2:= dev-libs/libevdev
 DESCRIPTION=Thermal daemon for Intel architectures
 EAPI=8
 HOMEPAGE=https://01.org/linux-thermal-daemon https://github.com/intel/thermal_daemon
+INHERIT=autotools out-of-source systemd
 KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 RDEPEND=dev-libs/dbus-glib:= dev-libs/glib:= dev-libs/libxml2:= dev-libs/libevdev sys-power/upower sys-apps/dbus:=
 SLOT=0
 SRC_URI=https://github.com/intel/thermal_daemon/archive/v2.4.8.tar.gz -> thermald-2.4.8.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	out-of-source	6dc5829f04ddee3f91b9bb274a701fdb	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	out-of-source	6dc5829f04ddee3f91b9bb274a701fdb	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=66391e158bf58f5228dd053c0c9bcf15
diff --git a/metadata/md5-cache/sys-power/thermald-2.4.9 b/metadata/md5-cache/sys-power/thermald-2.4.9
index a0563533b98e..182b5a3ba868 100644
--- a/metadata/md5-cache/sys-power/thermald-2.4.9
+++ b/metadata/md5-cache/sys-power/thermald-2.4.9
@@ -4,10 +4,11 @@ DEPEND=dev-libs/dbus-glib:= dev-libs/glib:= dev-libs/libxml2:= dev-libs/libevdev
 DESCRIPTION=Thermal daemon for Intel architectures
 EAPI=8
 HOMEPAGE=https://github.com/intel/thermal_daemon
+INHERIT=autotools out-of-source systemd
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
 RDEPEND=dev-libs/dbus-glib:= dev-libs/glib:= dev-libs/libxml2:= dev-libs/libevdev sys-power/upower sys-apps/dbus:=
 SLOT=0
 SRC_URI=https://github.com/intel/thermal_daemon/archive/v2.4.9.tar.gz -> thermald-2.4.9.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	out-of-source	6dc5829f04ddee3f91b9bb274a701fdb	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	out-of-source	6dc5829f04ddee3f91b9bb274a701fdb	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=c53d1b7d9bac4ae09e6662153a961ce1
diff --git a/metadata/md5-cache/sys-power/tuxedo-cc-wmi-0.1.4-r1 b/metadata/md5-cache/sys-power/tuxedo-cc-wmi-0.1.4-r1
index a14a0f7af04a..d1e1bf70d2d3 100644
--- a/metadata/md5-cache/sys-power/tuxedo-cc-wmi-0.1.4-r1
+++ b/metadata/md5-cache/sys-power/tuxedo-cc-wmi-0.1.4-r1
@@ -3,11 +3,12 @@ DEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:=
 DESCRIPTION=Kernel Module for Tuxedo WMI
 EAPI=7
 HOMEPAGE=https://github.com/tuxedocomputers/tuxedo-cc-wmi
+INHERIT=linux-mod toolchain-funcs
 IUSE=dist-kernel
 KEYWORDS=~amd64
 LICENSE=GPL-3
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=https://github.com/tuxedocomputers/tuxedo-cc-wmi/archive/v0.1.4.tar.gz -> tuxedo-cc-wmi-0.1.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	3cfb791b045bfb6773a6d0f2d80ce9fd	linux-mod	7d55f157d3072c067c44b09dac80bdf2	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	linux-mod	6ff232574f0bcad33767903505553e8d	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=3e3bd07426308af786957898aa17e828
diff --git a/metadata/md5-cache/sys-power/uhubctl-2.4.0 b/metadata/md5-cache/sys-power/uhubctl-2.4.0
index 992410da9664..03f70243d4de 100644
--- a/metadata/md5-cache/sys-power/uhubctl-2.4.0
+++ b/metadata/md5-cache/sys-power/uhubctl-2.4.0
@@ -4,10 +4,11 @@ DEPEND=virtual/libusb:1
 DESCRIPTION=USB hub per-port power control
 EAPI=7
 HOMEPAGE=https://github.com/mvp/uhubctl
+INHERIT=toolchain-funcs
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-2
 RDEPEND=virtual/libusb:1
 SLOT=0
 SRC_URI=https://github.com/mvp/uhubctl/archive/v2.4.0.tar.gz -> uhubctl-2.4.0.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=f36bd7852d08de483e939148e7048e28
diff --git a/metadata/md5-cache/sys-power/upower-0.99.12-r1 b/metadata/md5-cache/sys-power/upower-0.99.12-r1
index 77448c5f291a..6b4e3b1699bf 100644
--- a/metadata/md5-cache/sys-power/upower-0.99.12-r1
+++ b/metadata/md5-cache/sys-power/upower-0.99.12-r1
@@ -4,11 +4,12 @@ DEPEND=>=dev-libs/glib-2.38:2 sys-apps/dbus:= introspection? ( dev-libs/gobject-
 DESCRIPTION=D-Bus abstraction for enumerating power devices, querying history and statistics
 EAPI=8
 HOMEPAGE=https://upower.freedesktop.org/
+INHERIT=systemd xdg-utils
 IUSE=doc +introspection ios selinux
 KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.38:2 sys-apps/dbus:= introspection? ( dev-libs/gobject-introspection:= ) kernel_linux? ( >=dev-libs/libgudev-236:= virtual/udev ios? ( >=app-pda/libimobiledevice-1:= >=app-pda/libplist-2:= ) ) selinux? ( sec-policy/selinux-devicekit )
 SLOT=0/3
 SRC_URI=https://gitlab.freedesktop.org/upower/upower/uploads/244f5966c58773bbd3b4c507c549560f/upower-0.99.12.tar.xz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=cbb03e2614481e4faa6ed35e85d4bf29
diff --git a/metadata/md5-cache/sys-power/upower-0.99.17 b/metadata/md5-cache/sys-power/upower-0.99.17
index 493d37f80313..7c23257cfb42 100644
--- a/metadata/md5-cache/sys-power/upower-0.99.17
+++ b/metadata/md5-cache/sys-power/upower-0.99.17
@@ -12,5 +12,5 @@ RDEPEND=>=dev-libs/glib-2.56:2 sys-apps/dbus:= introspection? ( dev-libs/gobject
 RESTRICT=!test? ( test )
 SLOT=0/3
 SRC_URI=https://gitlab.freedesktop.org/upower/upower/-/archive/v0.99.17/upower-v0.99.17.tar.bz2
-_eclasses_=meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	udev	2d229ad4bfa09058e0184b1ca900db32	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	udev	f3a0a3964e2028a140c181f00eea9712	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=d3eb4064162bfeb70abacbe237c36cd9
diff --git a/metadata/md5-cache/sys-power/upower-0.99.18 b/metadata/md5-cache/sys-power/upower-0.99.18
new file mode 100644
index 000000000000..8a5c196b8edf
--- /dev/null
+++ b/metadata/md5-cache/sys-power/upower-0.99.18
@@ -0,0 +1,16 @@
+BDEPEND=app-text/docbook-xsl-stylesheets dev-libs/libxslt dev-util/gdbus-codegen >=sys-devel/gettext-0.19.8 virtual/pkgconfig doc? ( dev-util/gtk-doc ) test? ( || ( ( >=dev-lang/python-3.11.0_beta1-r1:3.11 dev-python/dbus-python[python_targets_python3_11(-)] dev-python/python-dbusmock[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.0_p1-r1:3.10 dev-python/dbus-python[python_targets_python3_10(-)] dev-python/python-dbusmock[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 dev-python/dbus-python[python_targets_python3_9(-)] dev-python/python-dbusmock[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 dev-python/dbus-python[python_targets_python3_8(-)] dev-python/python-dbusmock[python_targets_python3_8(-)] ) ) dev-util/umockdev ) >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=>=dev-libs/glib-2.58:2 sys-apps/dbus:= introspection? ( dev-libs/gobject-introspection:= ) kernel_linux? ( >=dev-libs/libgudev-236:= virtual/udev ios? ( >=app-pda/libimobiledevice-1:= >=app-pda/libplist-2:= ) )
+DESCRIPTION=D-Bus abstraction for enumerating power devices, querying history and statistics
+EAPI=8
+HOMEPAGE=https://upower.freedesktop.org/
+INHERIT=meson python-any-r1 systemd udev xdg-utils
+IUSE=doc +introspection ios selinux test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/glib-2.58:2 sys-apps/dbus:= introspection? ( dev-libs/gobject-introspection:= ) kernel_linux? ( >=dev-libs/libgudev-236:= virtual/udev ios? ( >=app-pda/libimobiledevice-1:= >=app-pda/libplist-2:= ) ) selinux? ( sec-policy/selinux-devicekit )
+RESTRICT=!test? ( test )
+SLOT=0/3
+SRC_URI=https://gitlab.freedesktop.org/upower/upower/-/archive/v0.99.18/upower-v0.99.18.tar.bz2
+_eclasses_=meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	udev	f3a0a3964e2028a140c181f00eea9712	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=393ca580a0f6b94e52ea1accf160c740
diff --git a/metadata/md5-cache/sys-power/upower-0.99.19 b/metadata/md5-cache/sys-power/upower-0.99.19
new file mode 100644
index 000000000000..d23a746df369
--- /dev/null
+++ b/metadata/md5-cache/sys-power/upower-0.99.19
@@ -0,0 +1,16 @@
+BDEPEND=app-text/docbook-xsl-stylesheets dev-libs/libxslt dev-util/gdbus-codegen >=sys-devel/gettext-0.19.8 virtual/pkgconfig doc? ( dev-util/gtk-doc ) test? ( || ( ( >=dev-lang/python-3.11.0_beta1-r1:3.11 dev-python/dbus-python[python_targets_python3_11(-)] dev-python/python-dbusmock[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.0_p1-r1:3.10 dev-python/dbus-python[python_targets_python3_10(-)] dev-python/python-dbusmock[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 dev-python/dbus-python[python_targets_python3_9(-)] dev-python/python-dbusmock[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 dev-python/dbus-python[python_targets_python3_8(-)] dev-python/python-dbusmock[python_targets_python3_8(-)] ) ) dev-util/umockdev ) >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-libs/glib-2.58:2 sys-apps/dbus:= introspection? ( dev-libs/gobject-introspection:= ) kernel_linux? ( >=dev-libs/libgudev-236:= virtual/udev ios? ( >=app-pda/libimobiledevice-1:= >=app-pda/libplist-2:= ) )
+DESCRIPTION=D-Bus abstraction for enumerating power devices, querying history and statistics
+EAPI=8
+HOMEPAGE=https://upower.freedesktop.org/
+INHERIT=meson python-any-r1 systemd udev xdg-utils
+IUSE=doc +introspection ios selinux test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/glib-2.58:2 sys-apps/dbus:= introspection? ( dev-libs/gobject-introspection:= ) kernel_linux? ( >=dev-libs/libgudev-236:= virtual/udev ios? ( >=app-pda/libimobiledevice-1:= >=app-pda/libplist-2:= ) ) selinux? ( sec-policy/selinux-devicekit )
+RESTRICT=!test? ( test )
+SLOT=0/3
+SRC_URI=https://gitlab.freedesktop.org/upower/upower/-/archive/v0.99.19/upower-v0.99.19.tar.bz2
+_eclasses_=meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	udev	f3a0a3964e2028a140c181f00eea9712	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=62bd8449d8812e3b05c8d83b442eee55