gentoo resync : 29.12.2022

31 files changed, 115 insertions, 63 deletions

diff --git a/metadata/md5-cache/app-laptop/Manifest.gz b/metadata/md5-cache/app-laptop/Manifest.gz
index 3a81e9432dae..b10bc3dce76d 100644
--- a/metadata/md5-cache/app-laptop/Manifest.gz
+++ b/metadata/md5-cache/app-laptop/Manifest.gz
diff --git a/metadata/md5-cache/app-laptop/dispad-0.3.1-r1 b/metadata/md5-cache/app-laptop/dispad-0.3.1-r1
index 7b4a9b34c224..d31182caf8d0 100644
--- a/metadata/md5-cache/app-laptop/dispad-0.3.1-r1
+++ b/metadata/md5-cache/app-laptop/dispad-0.3.1-r1
@@ -4,10 +4,11 @@ DEPEND=dev-libs/confuse x11-libs/libX11 x11-libs/libXi
 DESCRIPTION=Daemon to disable trackpads while typing
 EAPI=7
 HOMEPAGE=https://github.com/BlueDragonX/dispad
+INHERIT=autotools
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/confuse x11-libs/libX11 x11-libs/libXi
 SLOT=0
 SRC_URI=https://github.com/BlueDragonX/dispad/archive/v0.3.1.tar.gz -> dispad-0.3.1.tar.gz
-_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_=2461acf58b25c2030da9ae46980b38ee
diff --git a/metadata/md5-cache/app-laptop/hdapsd-20141203-r2 b/metadata/md5-cache/app-laptop/hdapsd-20141203-r2
index 0cda07fa5397..921d8207af75 100644
--- a/metadata/md5-cache/app-laptop/hdapsd-20141203-r2
+++ b/metadata/md5-cache/app-laptop/hdapsd-20141203-r2
@@ -4,11 +4,12 @@ DEPEND=libconfig? ( dev-libs/libconfig:= )
 DESCRIPTION=IBM ThinkPad Hard Drive Active Protection System (HDAPS) daemon
 EAPI=7
 HOMEPAGE=https://github.com/evgeni/hdapsd/
+INHERIT=linux-info readme.gentoo-r1 systemd
 IUSE=libconfig
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=libconfig? ( dev-libs/libconfig:= )
 SLOT=0
 SRC_URI=https://github.com/evgeni/hdapsd/releases/download/20141203/hdapsd-20141203.tar.gz
-_eclasses_=linux-info	3cfb791b045bfb6773a6d0f2d80ce9fd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	4fbbbc98f236f1b43acd99476bc3cd85	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=d12b50f9b7e16f1552bf8260328b8365
diff --git a/metadata/md5-cache/app-laptop/hdapsd-20141203-r3 b/metadata/md5-cache/app-laptop/hdapsd-20141203-r3
new file mode 100644
index 000000000000..b645ce6befc6
--- /dev/null
+++ b/metadata/md5-cache/app-laptop/hdapsd-20141203-r3
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=configure install postinst postrm setup
+DEPEND=libconfig? ( dev-libs/libconfig:= )
+DESCRIPTION=IBM ThinkPad Hard Drive Active Protection System (HDAPS) daemon
+EAPI=8
+HOMEPAGE=https://github.com/evgeni/hdapsd/
+INHERIT=linux-info readme.gentoo-r1 systemd udev
+IUSE=libconfig
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=libconfig? ( dev-libs/libconfig:= )
+SLOT=0
+SRC_URI=https://github.com/evgeni/hdapsd/releases/download/20141203/hdapsd-20141203.tar.gz
+_eclasses_=linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	4fbbbc98f236f1b43acd99476bc3cd85	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	udev	f3a0a3964e2028a140c181f00eea9712
+_md5_=668d732cce9845883e8521da4ce594a9
diff --git a/metadata/md5-cache/app-laptop/i8kutils-1.43 b/metadata/md5-cache/app-laptop/i8kutils-1.43
index dcd93ff0f284..58e3314372d7 100644
--- a/metadata/md5-cache/app-laptop/i8kutils-1.43
+++ b/metadata/md5-cache/app-laptop/i8kutils-1.43
@@ -4,10 +4,11 @@ DEPEND=dev-lang/tcl sys-power/acpi
 DESCRIPTION=Dell Inspiron and Latitude utilities
 EAPI=7
 HOMEPAGE=https://launchpad.net/i8kutils
+INHERIT=linux-info systemd toolchain-funcs
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=dev-lang/tcl sys-power/acpi
 SLOT=0
 SRC_URI=https://launchpad.net/i8kutils/trunk/1.43/+download/i8kutils_1.43.tar.xz -> i8kutils-1.43.tar.xz
-_eclasses_=linux-info	3cfb791b045bfb6773a6d0f2d80ce9fd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	4fbbbc98f236f1b43acd99476bc3cd85	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=b2b765d067ac93faf2a2f3cf9c8d0c50
diff --git a/metadata/md5-cache/app-laptop/ibam-0.5.2-r4 b/metadata/md5-cache/app-laptop/ibam-0.5.2-r4
index c941944e4c87..50a47caa9b0b 100644
--- a/metadata/md5-cache/app-laptop/ibam-0.5.2-r4
+++ b/metadata/md5-cache/app-laptop/ibam-0.5.2-r4
@@ -3,11 +3,12 @@ DEPEND=gkrellm? ( app-admin/gkrellm x11-libs/gdk-pixbuf x11-libs/gtk+:2 ) gkrell
 DESCRIPTION=Intelligent Battery Monitor
 EAPI=6
 HOMEPAGE=http://ibam.sourceforge.net/
+INHERIT=toolchain-funcs
 IUSE=gkrellm
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=gkrellm? ( app-admin/gkrellm x11-libs/gdk-pixbuf x11-libs/gtk+:2 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ibam/ibam-0.5.2.tar.gz mirror://debian/pool/main/i/ibam/ibam_0.5.2-2.1.diff.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=f02bdfa8c1ce1ad166b783ddd1028d5a
diff --git a/metadata/md5-cache/app-laptop/ibam-0.5.2-r5 b/metadata/md5-cache/app-laptop/ibam-0.5.2-r5
new file mode 100644
index 000000000000..e6254d8bcd23
--- /dev/null
+++ b/metadata/md5-cache/app-laptop/ibam-0.5.2-r5
@@ -0,0 +1,15 @@
+BDEPEND=gkrellm? ( virtual/pkgconfig )
+DEFINED_PHASES=compile install postinst
+DEPEND=gkrellm? ( app-admin/gkrellm:2[X] x11-libs/gdk-pixbuf x11-libs/gtk+:2 )
+DESCRIPTION=Intelligent Battery Monitor
+EAPI=8
+HOMEPAGE=http://ibam.sourceforge.net/
+INHERIT=toolchain-funcs optfeature
+IUSE=gkrellm
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=gkrellm? ( app-admin/gkrellm:2[X] x11-libs/gdk-pixbuf x11-libs/gtk+:2 )
+SLOT=0
+SRC_URI=mirror://sourceforge/ibam/ibam-0.5.2.tar.gz mirror://debian/pool/main/i/ibam/ibam_0.5.2-2.1.diff.gz
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	optfeature	d524f291c80f9d21ad80fe978e3ca760	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=a3c5c0b19af0d6a1917c59a56c4c8c4d
diff --git a/metadata/md5-cache/app-laptop/laptop-mode-tools-1.74 b/metadata/md5-cache/app-laptop/laptop-mode-tools-1.74
index a8a90528ffd2..f73c2bca7dd7 100644
--- a/metadata/md5-cache/app-laptop/laptop-mode-tools-1.74
+++ b/metadata/md5-cache/app-laptop/laptop-mode-tools-1.74
@@ -3,11 +3,12 @@ DEFINED_PHASES=compile install postinst
 DESCRIPTION=Linux kernel laptop_mode user-space utilities
 EAPI=7
 HOMEPAGE=https://github.com/rickysarraf/laptop-mode-tools/wiki
+INHERIT=optfeature systemd tmpfiles udev
 IUSE=+acpi apm
 KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
 RDEPEND=sys-apps/ethtool sys-apps/iproute2 sys-apps/which || ( sys-apps/sdparm sys-apps/hdparm ) acpi? ( sys-power/acpid ) apm? ( sys-apps/apmd ) virtual/tmpfiles
 SLOT=0
 SRC_URI=https://github.com/rickysarraf/laptop-mode-tools/releases/download/1.74/laptop-mode-tools_1.74.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	optfeature	d524f291c80f9d21ad80fe978e3ca760	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	udev	2d229ad4bfa09058e0184b1ca900db32
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	optfeature	d524f291c80f9d21ad80fe978e3ca760	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	udev	f3a0a3964e2028a140c181f00eea9712
 _md5_=0fdc6388370e33f39980dc62d1115815
diff --git a/metadata/md5-cache/app-laptop/mbpfan-2.1.1 b/metadata/md5-cache/app-laptop/mbpfan-2.1.1
index 980fbb25771e..6a5408dd48e9 100644
--- a/metadata/md5-cache/app-laptop/mbpfan-2.1.1
+++ b/metadata/md5-cache/app-laptop/mbpfan-2.1.1
@@ -3,10 +3,11 @@ DEPEND=virtual/pkgconfig
 DESCRIPTION=A simple daemon to control fan speed on all Macbook/Macbook Pros
 EAPI=6
 HOMEPAGE=https://github.com/dgraziotin/mbpfan
+INHERIT=linux-info systemd toolchain-funcs
 KEYWORDS=~amd64
 LICENSE=GPL-3+
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/dgraziotin/mbpfan/archive/v2.1.1.tar.gz -> mbpfan-2.1.1.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_=4c8105cdf3f921e3f5a18482ef2a3391
diff --git a/metadata/md5-cache/app-laptop/mbpfan-2.2.1 b/metadata/md5-cache/app-laptop/mbpfan-2.2.1
index bd38f6018aac..866be8e97aed 100644
--- a/metadata/md5-cache/app-laptop/mbpfan-2.2.1
+++ b/metadata/md5-cache/app-laptop/mbpfan-2.2.1
@@ -3,10 +3,11 @@ DEPEND=virtual/pkgconfig
 DESCRIPTION=A simple daemon to control fan speed on all Macbook/Macbook Pros
 EAPI=6
 HOMEPAGE=https://github.com/dgraziotin/mbpfan
+INHERIT=linux-info systemd toolchain-funcs
 KEYWORDS=~amd64
 LICENSE=GPL-3+
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/dgraziotin/mbpfan/archive/v2.2.1.tar.gz -> mbpfan-2.2.1.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_=8ac03d6d1ec17e2695c9094693e532e0
diff --git a/metadata/md5-cache/app-laptop/mbpfan-9999 b/metadata/md5-cache/app-laptop/mbpfan-9999
index 17ba51239b19..31a57291d647 100644
--- a/metadata/md5-cache/app-laptop/mbpfan-9999
+++ b/metadata/md5-cache/app-laptop/mbpfan-9999
@@ -3,9 +3,10 @@ DEPEND=virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=A simple daemon to control fan speed on all Macbook/Macbook Pros
 EAPI=6
 HOMEPAGE=https://github.com/dgraziotin/mbpfan
+INHERIT=linux-info systemd toolchain-funcs git-r3
 LICENSE=GPL-3+
 PROPERTIES=live
 RESTRICT=test
 SLOT=0
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	linux-info	3cfb791b045bfb6773a6d0f2d80ce9fd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	4fbbbc98f236f1b43acd99476bc3cd85	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=8ac03d6d1ec17e2695c9094693e532e0
diff --git a/metadata/md5-cache/app-laptop/msi-keyboard-1.0 b/metadata/md5-cache/app-laptop/msi-keyboard-1.0
index 7b44086c0a5f..7462851ae03d 100644
--- a/metadata/md5-cache/app-laptop/msi-keyboard-1.0
+++ b/metadata/md5-cache/app-laptop/msi-keyboard-1.0
@@ -3,10 +3,11 @@ DEFINED_PHASES=install
 DESCRIPTION=Control backlight of MSI laptop keyboards
 EAPI=7
 HOMEPAGE=https://github.com/makkarpov/msi-keyboard
+INHERIT=udev
 KEYWORDS=~amd64
 LICENSE=GPL-3
 RDEPEND=dev-libs/hidapi
 SLOT=0
 SRC_URI=https://github.com/makkarpov/msi-keyboard/archive/v1.0.tar.gz -> msi-keyboard-1.0.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	udev	2d229ad4bfa09058e0184b1ca900db32
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	udev	f3a0a3964e2028a140c181f00eea9712
 _md5_=33a1217ab9ce1c71f6822f2712b6f052
diff --git a/metadata/md5-cache/app-laptop/msi-keyboard-1.0-r1 b/metadata/md5-cache/app-laptop/msi-keyboard-1.0-r1
new file mode 100644
index 000000000000..99c1cc2c2094
--- /dev/null
+++ b/metadata/md5-cache/app-laptop/msi-keyboard-1.0-r1
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install postrm prerm
+DEPEND=dev-libs/hidapi
+DESCRIPTION=Control backlight of MSI laptop keyboards
+EAPI=8
+HOMEPAGE=https://github.com/makkarpov/msi-keyboard
+INHERIT=toolchain-funcs udev
+KEYWORDS=~amd64
+LICENSE=GPL-3
+RDEPEND=dev-libs/hidapi
+SLOT=0
+SRC_URI=https://github.com/makkarpov/msi-keyboard/archive/v1.0.tar.gz -> msi-keyboard-1.0.tar.gz
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	udev	f3a0a3964e2028a140c181f00eea9712
+_md5_=d07a69c88bc7eab467ea31ad91b6e064
diff --git a/metadata/md5-cache/app-laptop/pbbuttonsd-0.8.1a b/metadata/md5-cache/app-laptop/pbbuttonsd-0.8.1a
index 18ddfd8f7994..55d981ffc07d 100644
--- a/metadata/md5-cache/app-laptop/pbbuttonsd-0.8.1a
+++ b/metadata/md5-cache/app-laptop/pbbuttonsd-0.8.1a
@@ -4,11 +4,12 @@ DEPEND=dev-libs/glib alsa? ( media-libs/alsa-lib ) macbook? ( sys-apps/pciutils
 DESCRIPTION=Handles power management and special keys on laptops
 EAPI=7
 HOMEPAGE=http://pbbuttons.berlios.de
+INHERIT=autotools flag-o-matic toolchain-funcs
 IUSE=acpi alsa doc ibam macbook oss
 KEYWORDS=~amd64 ppc ~x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib alsa? ( media-libs/alsa-lib ) macbook? ( sys-apps/pciutils sys-libs/libsmbios )
 SLOT=0
 SRC_URI=mirror://sourceforge/pbbuttons/pbbuttonsd-0.8.1a.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=504bae33b9312e4ae8b8f4dca8ee4a00
diff --git a/metadata/md5-cache/app-laptop/pommed-1.39-r2 b/metadata/md5-cache/app-laptop/pommed-1.39-r2
index aac5c00be7b0..ddc5e2a07c15 100644
--- a/metadata/md5-cache/app-laptop/pommed-1.39-r2
+++ b/metadata/md5-cache/app-laptop/pommed-1.39-r2
@@ -4,11 +4,12 @@ DEPEND=media-libs/alsa-lib media-libs/audiofile dev-libs/confuse dev-libs/dbus-g
 DESCRIPTION=Manage screen and keyboard backlight on Apple MacBook Pro/PowerBook
 EAPI=7
 HOMEPAGE=http://technologeek.org/projects/pommed/index.html
+INHERIT=desktop linux-info systemd
 IUSE=gtk X
 KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
 RDEPEND=media-libs/alsa-lib media-libs/audiofile dev-libs/confuse dev-libs/dbus-glib sys-apps/dbus sys-libs/zlib amd64? ( sys-apps/pciutils ) x86? ( sys-apps/pciutils ) gtk? ( x11-libs/gtk+:2 ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXpm ) media-sound/alsa-utils sys-apps/util-linux
 SLOT=0
 SRC_URI=http://alioth.debian.org/frs/download.php/3583/pommed-1.39.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	3cfb791b045bfb6773a6d0f2d80ce9fd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	4fbbbc98f236f1b43acd99476bc3cd85	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=488a05324ece43941d7b955ac491170e
diff --git a/metadata/md5-cache/app-laptop/rogauracore-1.5 b/metadata/md5-cache/app-laptop/rogauracore-1.5
index 97aaca009b43..5cd1a22fcc81 100644
--- a/metadata/md5-cache/app-laptop/rogauracore-1.5
+++ b/metadata/md5-cache/app-laptop/rogauracore-1.5
@@ -1,13 +1,14 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure prepare
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=compile configure postinst postrm prepare
 DEPEND=virtual/libusb:=
 DESCRIPTION=RGB keyboard control for Asus ROG laptops
 EAPI=7
 HOMEPAGE=https://github.com/wroberts/rogauracore
-KEYWORDS=~amd64
+INHERIT=autotools udev
+KEYWORDS=amd64
 LICENSE=MIT
 RDEPEND=virtual/libusb:=
 SLOT=0
 SRC_URI=https://github.com/wroberts/rogauracore/archive/refs/tags/1.5.tar.gz -> rogauracore-1.5.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=efbaef08b699340861d5dd3b40da1814
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	udev	f3a0a3964e2028a140c181f00eea9712
+_md5_=74801a75389dc82d5a170546c2baa270
diff --git a/metadata/md5-cache/app-laptop/rogauracore-1.4 b/metadata/md5-cache/app-laptop/rogauracore-1.6
index 6d9feb08fe0f..e1a78aedde0d 100644
--- a/metadata/md5-cache/app-laptop/rogauracore-1.4
+++ b/metadata/md5-cache/app-laptop/rogauracore-1.6
@@ -1,13 +1,14 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure prepare
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=compile configure postinst postrm prepare
 DEPEND=virtual/libusb:=
 DESCRIPTION=RGB keyboard control for Asus ROG laptops
-EAPI=7
+EAPI=8
 HOMEPAGE=https://github.com/wroberts/rogauracore
-KEYWORDS=~amd64
+INHERIT=autotools udev
+KEYWORDS=amd64
 LICENSE=MIT
 RDEPEND=virtual/libusb:=
 SLOT=0
-SRC_URI=https://github.com/wroberts/rogauracore/archive/refs/tags/1.4.tar.gz -> rogauracore-1.4.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=efbaef08b699340861d5dd3b40da1814
+SRC_URI=https://github.com/wroberts/rogauracore/archive/refs/tags/1.6.tar.gz -> rogauracore-1.6.tar.gz
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	udev	f3a0a3964e2028a140c181f00eea9712
+_md5_=a2d4f5b9c834c0f5d274b7f26646bd90
diff --git a/metadata/md5-cache/app-laptop/rogauracore-9999 b/metadata/md5-cache/app-laptop/rogauracore-9999
index 7fec0934c11b..09554a5394fd 100644
--- a/metadata/md5-cache/app-laptop/rogauracore-9999
+++ b/metadata/md5-cache/app-laptop/rogauracore-9999
@@ -1,12 +1,13 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=compile configure prepare unpack
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile configure postinst postrm prepare unpack
 DEPEND=virtual/libusb:=
 DESCRIPTION=RGB keyboard control for Asus ROG laptops
-EAPI=7
+EAPI=8
 HOMEPAGE=https://github.com/wroberts/rogauracore
+INHERIT=autotools udev git-r3
 LICENSE=MIT
 PROPERTIES=live
 RDEPEND=virtual/libusb:=
 SLOT=0
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=efbaef08b699340861d5dd3b40da1814
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	udev	f3a0a3964e2028a140c181f00eea9712
+_md5_=7c6992e20ffe97d9e246d25b78cf2a68
diff --git a/metadata/md5-cache/app-laptop/spicctrl-1.9-r1 b/metadata/md5-cache/app-laptop/spicctrl-1.9-r1
index 291177b8f863..411a684d7950 100644
--- a/metadata/md5-cache/app-laptop/spicctrl-1.9-r1
+++ b/metadata/md5-cache/app-laptop/spicctrl-1.9-r1
@@ -2,9 +2,10 @@ DEFINED_PHASES=configure install
 DESCRIPTION=tool for the sonypi-Device (found in Sony Vaio Notebooks)
 EAPI=7
 HOMEPAGE=https://www.popies.net/sonypi/
+INHERIT=toolchain-funcs
 KEYWORDS=~amd64 -ppc x86
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=https://www.popies.net/sonypi/spicctrl-1.9.tar.bz2
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=aaadb642f7a2df3febf7dbc25369d81f
diff --git a/metadata/md5-cache/app-laptop/thinkfan-1.0.2 b/metadata/md5-cache/app-laptop/thinkfan-1.0.2
index 7bdabaca4212..254a0b03a320 100644
--- a/metadata/md5-cache/app-laptop/thinkfan-1.0.2
+++ b/metadata/md5-cache/app-laptop/thinkfan-1.0.2
@@ -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=atasmart? ( dev-libs/libatasmart ) yaml? ( dev-cpp/yaml-cpp )
 DESCRIPTION=Simple fan control program for thinkpads
@@ -11,5 +11,5 @@ LICENSE=GPL-3
 RDEPEND=atasmart? ( dev-libs/libatasmart ) yaml? ( dev-cpp/yaml-cpp ) nvidia? ( x11-drivers/nvidia-drivers )
 SLOT=0
 SRC_URI=https://github.com/vmatare/thinkfan/archive/1.0.2.tar.gz -> thinkfan-1.0.2.tar.gz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	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	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=0872dfd1c05e37beedc5eced21c95f99
diff --git a/metadata/md5-cache/app-laptop/thinkfan-1.2.1 b/metadata/md5-cache/app-laptop/thinkfan-1.2.1
index 0c9998ffb046..b6ae07cb1021 100644
--- a/metadata/md5-cache/app-laptop/thinkfan-1.2.1
+++ b/metadata/md5-cache/app-laptop/thinkfan-1.2.1
@@ -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=atasmart? ( dev-libs/libatasmart ) yaml? ( dev-cpp/yaml-cpp )
 DESCRIPTION=Simple fan control program for thinkpads
@@ -11,5 +11,5 @@ LICENSE=GPL-3
 RDEPEND=atasmart? ( dev-libs/libatasmart ) yaml? ( dev-cpp/yaml-cpp ) nvidia? ( x11-drivers/nvidia-drivers )
 SLOT=0
 SRC_URI=https://github.com/vmatare/thinkfan/archive/1.2.1.tar.gz -> thinkfan-1.2.1.tar.gz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	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	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=c5a724c11085a0fa273e18c6faec74df
diff --git a/metadata/md5-cache/app-laptop/thinkfan-1.2.2 b/metadata/md5-cache/app-laptop/thinkfan-1.2.2
index a44409959ba8..eb52eec36f59 100644
--- a/metadata/md5-cache/app-laptop/thinkfan-1.2.2
+++ b/metadata/md5-cache/app-laptop/thinkfan-1.2.2
@@ -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=atasmart? ( dev-libs/libatasmart ) yaml? ( dev-cpp/yaml-cpp )
 DESCRIPTION=Simple fan control program for thinkpads
@@ -11,5 +11,5 @@ LICENSE=GPL-3
 RDEPEND=atasmart? ( dev-libs/libatasmart ) yaml? ( dev-cpp/yaml-cpp ) nvidia? ( x11-drivers/nvidia-drivers )
 SLOT=0
 SRC_URI=https://github.com/vmatare/thinkfan/archive/1.2.2.tar.gz -> thinkfan-1.2.2.tar.gz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	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	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=68eb05ed026cdc1e68176f79fdd321a7
diff --git a/metadata/md5-cache/app-laptop/thinkfan-1.3.1 b/metadata/md5-cache/app-laptop/thinkfan-1.3.1
index ad971ec145af..23f7ed65a63b 100644
--- a/metadata/md5-cache/app-laptop/thinkfan-1.3.1
+++ b/metadata/md5-cache/app-laptop/thinkfan-1.3.1
@@ -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=atasmart? ( dev-libs/libatasmart ) yaml? ( dev-cpp/yaml-cpp )
 DESCRIPTION=Simple fan control program for thinkpads
@@ -11,5 +11,5 @@ LICENSE=GPL-3
 RDEPEND=atasmart? ( dev-libs/libatasmart ) yaml? ( dev-cpp/yaml-cpp ) nvidia? ( x11-drivers/nvidia-drivers )
 SLOT=0
 SRC_URI=https://github.com/vmatare/thinkfan/archive/1.3.1.tar.gz -> thinkfan-1.3.1.tar.gz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=352142c92db14fb5ee53525511ce87ea
diff --git a/metadata/md5-cache/app-laptop/tp_smapi-0.43-r1 b/metadata/md5-cache/app-laptop/tp_smapi-0.43-r1
index a49ab6bf78a9..8de0a725cbd0 100644
--- a/metadata/md5-cache/app-laptop/tp_smapi-0.43-r1
+++ b/metadata/md5-cache/app-laptop/tp_smapi-0.43-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=sys-apps/dmidecode kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=https://github.com/evgeni/tp_smapi/releases/download/tp-smapi/0.43/tp_smapi-0.43.tgz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	linux-info	3cfb791b045bfb6773a6d0f2d80ce9fd	linux-mod	7d55f157d3072c067c44b09dac80bdf2	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	linux-mod	6ff232574f0bcad33767903505553e8d	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=df35c217300f0cd1d55d7725b57933aa
diff --git a/metadata/md5-cache/app-laptop/tpacpi-bat-3.0-r1 b/metadata/md5-cache/app-laptop/tpacpi-bat-3.0-r1
index 8677b5e70822..de09d9ea75c9 100644
--- a/metadata/md5-cache/app-laptop/tpacpi-bat-3.0-r1
+++ b/metadata/md5-cache/app-laptop/tpacpi-bat-3.0-r1
@@ -3,10 +3,11 @@ DEPEND=virtual/pkgconfig
 DESCRIPTION=Control battery thresholds of recent ThinkPads, not supported by tp_smapi
 EAPI=6
 HOMEPAGE=https://github.com/teleshoes/tpacpi-bat
+INHERIT=systemd
 KEYWORDS=~amd64
 LICENSE=GPL-3
 RDEPEND=sys-power/acpi_call dev-lang/perl
 SLOT=0
 SRC_URI=https://github.com/teleshoes/tpacpi-bat/archive/v3.0.tar.gz -> tpacpi-bat-3.0.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=5ffc3dac2d1ba55d8f93bd7ee3c4044c
diff --git a/metadata/md5-cache/app-laptop/tpacpi-bat-3.1 b/metadata/md5-cache/app-laptop/tpacpi-bat-3.1
index 5b539a40b418..59a2399826f6 100644
--- a/metadata/md5-cache/app-laptop/tpacpi-bat-3.1
+++ b/metadata/md5-cache/app-laptop/tpacpi-bat-3.1
@@ -3,10 +3,11 @@ DEPEND=virtual/pkgconfig
 DESCRIPTION=Control battery thresholds of recent ThinkPads, not supported by tp_smapi
 EAPI=6
 HOMEPAGE=https://github.com/teleshoes/tpacpi-bat
+INHERIT=systemd
 KEYWORDS=~amd64
 LICENSE=GPL-3
 RDEPEND=sys-power/acpi_call dev-lang/perl
 SLOT=0
 SRC_URI=https://github.com/teleshoes/tpacpi-bat/archive/v3.1.tar.gz -> tpacpi-bat-3.1.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=a73e100edef8c0b95c13516384577120
diff --git a/metadata/md5-cache/app-laptop/tpacpi-bat-9999 b/metadata/md5-cache/app-laptop/tpacpi-bat-9999
index 872dd918c83a..4039db87f30b 100644
--- a/metadata/md5-cache/app-laptop/tpacpi-bat-9999
+++ b/metadata/md5-cache/app-laptop/tpacpi-bat-9999
@@ -3,9 +3,10 @@ DEPEND=virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=Control battery thresholds of recent ThinkPads, not supported by tp_smapi
 EAPI=6
 HOMEPAGE=https://github.com/teleshoes/tpacpi-bat
+INHERIT=systemd git-r3
 LICENSE=GPL-3
 PROPERTIES=live
 RDEPEND=sys-power/acpi_call dev-lang/perl
 SLOT=0
-_eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4fbbbc98f236f1b43acd99476bc3cd85	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=a73e100edef8c0b95c13516384577120
diff --git a/metadata/md5-cache/app-laptop/tpb-0.6.4-r1 b/metadata/md5-cache/app-laptop/tpb-0.6.4-r1
index ede61ffde447..69ed82f5bd48 100644
--- a/metadata/md5-cache/app-laptop/tpb-0.6.4-r1
+++ b/metadata/md5-cache/app-laptop/tpb-0.6.4-r1
@@ -3,11 +3,12 @@ DEPEND=x11-libs/libXt x11-libs/libXext xosd? ( >=x11-libs/xosd-2.2.0 )
 DESCRIPTION=IBM ThinkPad buttons utility
 EAPI=7
 HOMEPAGE=https://savannah.nongnu.org/projects/tpb/
+INHERIT=linux-info
 IUSE=nls xosd
 KEYWORDS=amd64 -ppc x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/libXt x11-libs/libXext xosd? ( >=x11-libs/xosd-2.2.0 )
 SLOT=0
 SRC_URI=https://savannah.nongnu.org/download/tpb/tpb-0.6.4.tar.gz
-_eclasses_=linux-info	3cfb791b045bfb6773a6d0f2d80ce9fd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=2e56173b35453c3476e8dedde0918a80
diff --git a/metadata/md5-cache/app-laptop/tuxedo-control-center-bin-1.1.0-r2 b/metadata/md5-cache/app-laptop/tuxedo-control-center-bin-1.1.4
index dad31180f65e..f05872c3f53d 100644
--- a/metadata/md5-cache/app-laptop/tuxedo-control-center-bin-1.1.0-r2
+++ b/metadata/md5-cache/app-laptop/tuxedo-control-center-bin-1.1.4
@@ -1,14 +1,15 @@
 BDEPEND=app-arch/xz-utils[extra-filters] app-arch/rpm2targz virtual/pkgconfig
 DEFINED_PHASES=config install postinst postrm prepare unpack
-DEPEND=sys-power/tuxedo-cc-wmi
+DEPEND=>=app-laptop/tuxedo-keyboard-3.0.0
 DESCRIPTION=Tool to control performance, energy, fan and comfort settings on TUXEDO laptops
 EAPI=7
 HOMEPAGE=https://github.com/tuxedocomputers/tuxedo-control-center
+INHERIT=rpm systemd xdg-utils
 KEYWORDS=-* ~amd64
 LICENSE=GPL-3
-RDEPEND=sys-power/tuxedo-cc-wmi
+RDEPEND=>=app-laptop/tuxedo-keyboard-3.0.0
 RESTRICT=strip splitdebug
 SLOT=0
-SRC_URI=https://rpm.tuxedocomputers.com/opensuse/15.2/x86_64/tuxedo-control-center_1.1.0.rpm
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	rpm	f73e907469f65e52192f110dec72dce0	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=b072b2f75b0f9b443591b1c04f2acf1b
+SRC_URI=https://rpm.tuxedocomputers.com/opensuse/15.2/x86_64/tuxedo-control-center_1.1.4.rpm
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	multilib	4fbbbc98f236f1b43acd99476bc3cd85	rpm	f73e907469f65e52192f110dec72dce0	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=c9a8c25214ebfbfcccb4ddabf2ea2cf1
diff --git a/metadata/md5-cache/app-laptop/tuxedo-keyboard-2.0.5-r1 b/metadata/md5-cache/app-laptop/tuxedo-keyboard-3.0.10
index c489029080e4..b790b45e150d 100644
--- a/metadata/md5-cache/app-laptop/tuxedo-keyboard-2.0.5-r1
+++ b/metadata/md5-cache/app-laptop/tuxedo-keyboard-3.0.10
@@ -3,11 +3,12 @@ DEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:=
 DESCRIPTION=Kernel Module for Tuxedo Keyboard
 EAPI=7
 HOMEPAGE=https://github.com/tuxedocomputers/tuxedo-keyboard
+INHERIT=linux-mod toolchain-funcs
 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/tuxedocomputers/tuxedo-keyboard/archive/v2.0.5.tar.gz -> tuxedo-keyboard-2.0.5.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	3cfb791b045bfb6773a6d0f2d80ce9fd	linux-mod	7d55f157d3072c067c44b09dac80bdf2	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=979a365d9093e7136d6f90201f57d358
+SRC_URI=https://github.com/tuxedocomputers/tuxedo-keyboard/archive/v3.0.10.tar.gz -> tuxedo-keyboard-3.0.10.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	linux-mod	6ff232574f0bcad33767903505553e8d	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=953cf73d2a92ffe00f50e340de4e08fe
diff --git a/metadata/md5-cache/app-laptop/tuxedo-keyboard-3.0.8 b/metadata/md5-cache/app-laptop/tuxedo-keyboard-3.0.8
deleted file mode 100644
index 43510e16f797..000000000000
--- a/metadata/md5-cache/app-laptop/tuxedo-keyboard-3.0.8
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst setup
-DEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
-DESCRIPTION=Kernel Module for Tuxedo Keyboard
-EAPI=7
-HOMEPAGE=https://github.com/tuxedocomputers/tuxedo-keyboard
-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/tuxedocomputers/tuxedo-keyboard/archive/v3.0.8.tar.gz -> tuxedo-keyboard-3.0.8.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	3cfb791b045bfb6773a6d0f2d80ce9fd	linux-mod	7d55f157d3072c067c44b09dac80bdf2	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=10db22c86bdb1afadccc50ffc6429212