gentoo resync : 29.12.2022

25 files changed, 319 insertions, 256 deletions

diff --git a/sys-power/Manifest.gz b/sys-power/Manifest.gz
index 758ff9a2b6a7..3c3e40659163 100644
--- a/sys-power/Manifest.gz
+++ b/sys-power/Manifest.gz
diff --git a/sys-power/acpid/Manifest b/sys-power/acpid/Manifest
index 1b822d736dd9..955487edd21a 100644
--- a/sys-power/acpid/Manifest
+++ b/sys-power/acpid/Manifest
@@ -8,5 +8,5 @@ DIST acpid-2.0.32.tar.xz 155768 BLAKE2B 829b2f78f497d9c0bbd90d952cadad96beece307
 DIST acpid-2.0.33.tar.xz 156580 BLAKE2B 72a0835f3d88f4ccae44016809fdb930977f6b02dae6f74068186a8c850237764a1e8cd69a478e5af42115d5f630a9f91cd77b35b8cf01854e24b7e06bbdd536 SHA512 491a58c62fcad44dc57cbd9294437fbc215c2ec99a030286601cd1956ea504e723e61b11b315983073d66aace1997bc40e6421475f6073298f60b8dcda2add75
 DIST sys-power_acpid_2.0.32-r2_extras.tar.xz 2196 BLAKE2B 0975289f7cff6ce24523246f1daac22149d69c410e07a19a5952457e269fc1f736bd3636c93038f660c411f3085d375250c31dc3de3ac1bc6335a97e1fa3dea3 SHA512 f49cf3f75f5db4ca454d29330ae40461deb1109f076e140188a7560fedd78970572a6c023146c4d33c0778ff65056abcbc66725c000ece8e6861419d02d0c6ca
 EBUILD acpid-2.0.32-r2.ebuild 2045 BLAKE2B b56db810ba3b4362af38554efe552d1eb43fc461b14f892a8b428c0a0c179eb8c87d74761560f371a0c12ab83ec238600ef546539ae0d2e246982ee38f035e00 SHA512 e9da73f20d105b2b5347be72d40d0412bb3a51d91350b91b61f3233508b6d65e4bf7c80d9eb3d18c5a56fa86c9167911655bf6ba7581c578890e0875e496d132
-EBUILD acpid-2.0.33.ebuild 1496 BLAKE2B 7aa0a7e08eaac39257804fb7ad78709166f785d18a2984654005e054661b907c31fd61dfd0216e0989aaf488db2abaf3ec69c963416af6e95c9fdb7d78dc2c20 SHA512 71d49bb7a3e95563d8962064d339649a51a91379dc651958cdd8f3bace9341b5b02bb9f7dad7dba2d6fa593ccf458129134d5362593c7f93d6932cf1d301fc07
+EBUILD acpid-2.0.33.ebuild 1502 BLAKE2B 394de2559a5dcb426b1b6ae3802f87638deb742f4f276a77d4b75916fb571c032d0a468de92bbab9addcd807a39a1775b8424ca6af8e4b49fe0ef9355bdf479c SHA512 7a106fb61887b45c637ee3dfa4f09f79bfd75c11babcf2c0f78c980d499ba5c3410f68648c746b38f947d21b38682e12d7980be5932abfbd8ca27f29ee53c386
 MISC metadata.xml 322 BLAKE2B 8b701e7a97b323471ea98b4eb2ffcd6d6b195182e2aa1aa07cbcdafc7d0ae9afb7d24b55982adb183c7c73c33cbedb8a82232b6531ebb2fce30d22cb29a0cdee SHA512 0e5ea0b0d6f75b99babbd2578e1fb2b2fff20584699c3a762cb8395cb52c141509f109ed2894e5c3fb4c338ce32297a67a31f313c5141b5a23c758c7a21586f9
diff --git a/sys-power/acpid/acpid-2.0.33.ebuild b/sys-power/acpid/acpid-2.0.33.ebuild
index ea38f6148a38..ce3ff788217e 100644
--- a/sys-power/acpid/acpid-2.0.33.ebuild
+++ b/sys-power/acpid/acpid-2.0.33.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}2/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~ia64 ~loong ~riscv ~x86"
 IUSE="selinux"
 
 RDEPEND="selinux? ( sec-policy/selinux-apm )"
diff --git a/sys-power/acpilight/Manifest b/sys-power/acpilight/Manifest
index 1a86d1a2a361..0f53121b8274 100644
--- a/sys-power/acpilight/Manifest
+++ b/sys-power/acpilight/Manifest
@@ -2,6 +2,5 @@ AUX acpilight-1.2-fix-log10-of-zero.patch 715 BLAKE2B 33a33f4869a5c3cc27898ca5ad
 AUX acpilight.confd 269 BLAKE2B 196245bd083f89d9d975a81aaaf66d0422655cd6a5f575c2cbb898747c92bdb888f8123dbf8ddf34089be2547d39e33508119065ffb97c26f9d1d3915bee8bb2 SHA512 28e513dbcaa30cec4d2f876c244766037eb6e94ff660ff2caf9cb955f40c710ea750cac73eb5e3890b42904227ccbd7f6c3e2595c2496e54d3339d6afdd0ffb0
 AUX acpilight.initd 1183 BLAKE2B 061676f47bfbd07a46c3bf6ab1cbebaca22fe8e5f43afc445ef30ac3b0b5f74a99d0f061c28b2c26b458b3606ffbe8afb6344aca6a4d5a19699b29614445a45c SHA512 623115ef09c5163d1c7301e0bc9a631cf414fc36d78677d12430091775bade6df51bd8d8e4ff597de4cc09f92cf1ab11ea29f8370f3e8e8e608191a044e4a200
 DIST acpilight-v1.2.tar.gz 18068 BLAKE2B 469fd12c0a24b152681d73add559733a294f8a0848f46d0d3a1e209dea2ad3b180294677a8d84a82387ec34b00bbfda85a10f447fe22b81a3c51225cdce14051 SHA512 ef634ec0f315fe94dca138f1b9231f320b93340db3365ab9a09cf898fe4691f70573041bcb04563d760f1201000ea3ff11ab5dad3bfffddf3d3070dedb5732d7
-EBUILD acpilight-1.2-r3.ebuild 1585 BLAKE2B 7ed3f91cb9b9e413e7496fe5d12ed33b96823545003853c32221a1df5b0c0d04d03c9d67d7b4cbee41fcdc6e118bab1226039037c5210e263a10f711a62aa3f2 SHA512 ece73afbc9b63c882de55b37f2236d76869263b40e44d0e963afb1f93608b2e814355cc0f63e043af1dd5223e98e8582d7187712a98cc0fa171ead64465bb52f
-EBUILD acpilight-1.2-r4.ebuild 1588 BLAKE2B 31a48bf0f5daeacf30eb802722bd2caa0bd4b2f4cd48d070c5372a67df76dc92456f6ab32b32f0a1263c3b5f4e58f4f4f23dc6a9f18d98027772c26373425c97 SHA512 e64bbda79101339cd0314dc84d740832b2bfe69f6c0e48b40fbafbef66e85d510f4a8888d5f357242a5367e6958ab8ae68a372b1e39c5e89ffde6e0d80e17ec8
+EBUILD acpilight-1.2-r4.ebuild 1653 BLAKE2B 694a4a9f6932b2285cb30c831b55ce4e1868c40ea13c73579f0140d63dc1306c90fae6bb6a0f8ea94ba46117acb5cbec8a127413278cbf86255e1682123ddc6a SHA512 050dd89d64991a72e4d27f02eac42dae116c7e23b9218ce326cd1dde198b0c0c0823018b0112d6065daa2fd9af4704b99d60a5d0c8425961b45da5cf19c7e14f
 MISC metadata.xml 338 BLAKE2B b78b457b201249e0b1636adbc1ad883254cae74f9212a2acc135a399b78a0987434cdce7c584e1b421b512dc1086c47883b75b5bb4cc79ac17255f6f4a16fe87 SHA512 08d6d838162f11e7c96760d6fdd4f4137359e03ad74e7ef0a8427a6b0df744988a56dbf2c97e3e2bf77156438873b307c2f073bcfd2e6e023e25606baa6ed6aa
diff --git a/sys-power/acpilight/acpilight-1.2-r3.ebuild b/sys-power/acpilight/acpilight-1.2-r3.ebuild
deleted file mode 100644
index c54de4cb4446..000000000000
--- a/sys-power/acpilight/acpilight-1.2-r3.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_7 python3_8 python3_9 )
-
-inherit python-single-r1 udev
-
-MY_P="${PN}-v${PV}"
-
-DESCRIPTION="Replacement for xbacklight that uses the ACPI interface to set brightness"
-HOMEPAGE="https://gitlab.com/wavexx/acpilight/"
-SRC_URI="https://gitlab.com/wavexx/acpilight/-/archive/v${PV}/${MY_P}.tar.gz"
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-S="${WORKDIR}/${MY_P}"
-
-RDEPEND="virtual/udev
-	acct-group/video
-	!dev-libs/light
-	${PYTHON_DEPS}
-	!x11-apps/xbacklight"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-DOCS=( README.rst NEWS.rst )
-
-PATCHES=( "${FILESDIR}/acpilight-1.2-fix-log10-of-zero.patch" )
-
-# Disable Makefile that installs by default
-src_compile() { :; }
-
-src_install() {
-	python_doscript xbacklight
-	udev_dorules "${S}"/90-backlight.rules
-	doman xbacklight.1
-	einstalldocs
-	newinitd "${FILESDIR}"/acpilight.initd acpilight
-	newconfd "${FILESDIR}"/acpilight.confd acpilight
-}
-
-pkg_postinst() {
-	udev_reload
-	einfo
-	elog "To use the xbacklight binary as a regular user, you must be a part of the video group"
-	einfo
-	elog "If this utility does not find any backlights to manipulate,"
-	elog "verify you have kernel support on the device and display driver enabled."
-	einfo
-	elog "To take advantage of the OpenRC init script, and automate the process of"
-	elog "saving and restoring the brightness level you should add acpilight"
-	elog "to the boot runlevel. You can do this as root like so:"
-	elog "# rc-update add acpilight boot"
-	einfo
-}
diff --git a/sys-power/acpilight/acpilight-1.2-r4.ebuild b/sys-power/acpilight/acpilight-1.2-r4.ebuild
index 709ff0ca9954..16457c2bda89 100644
--- a/sys-power/acpilight/acpilight-1.2-r4.ebuild
+++ b/sys-power/acpilight/acpilight-1.2-r4.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://gitlab.com/wavexx/acpilight/"
 SRC_URI="https://gitlab.com/wavexx/acpilight/-/archive/v${PV}/${MY_P}.tar.gz"
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 S="${WORKDIR}/${MY_P}"
@@ -55,3 +55,8 @@ pkg_postinst() {
 	elog "# rc-update add acpilight boot"
 	einfo
 }
+
+pkg_postrm() {
+	# Triggers a QA warning if missing
+	udev_reload
+}
diff --git a/sys-power/apcupsd/Manifest b/sys-power/apcupsd/Manifest
index a8c91e497ae8..8a267f07624e 100644
--- a/sys-power/apcupsd/Manifest
+++ b/sys-power/apcupsd/Manifest
@@ -11,5 +11,5 @@ AUX apcupsd.init 804 BLAKE2B 7afd83a6be8b068133f6221cc2396a1fe4cab23f6dec68957b4
 AUX apcupsd.powerfail.init 397 BLAKE2B 472512906536753d3054d275707764a98094c14866da63fbc8d2d62e16a9099fdce0b61cf572a4ba862f0be13e1ed3407821ed07ec90f9c77fb8d95f18aafc2f SHA512 cd0ed9d24a8371de7920bf0ce2e89bb63c0bee58da1ac782ed2b929068f95b2af47458529223a33ecea4e8f73ddfe3a7b9591af6f64828de7ed1d91e2edbb6e1
 AUX apcupsd.service 111 BLAKE2B bf2ac8161af5b971642298c30b08ad78d289044bb2452bdef39b31119b60eceb0a14add7c00262132bb80dbf1964103242452cb8d9b815d6ec82c204100ea184 SHA512 011e3e52e7909f36fb73b6064277a69e5db41263cfc72bda07e326172396d5318cd2b050f1fb84c4cc6da7a247c0035c36c55322ffb234a1cfa7bf13ba492889
 DIST apcupsd-3.14.14.tar.gz 1843409 BLAKE2B 48a3b249780064d699d86b658584aa222ce9f3b46a81209110b4684bf737cca7492b87b063154864ce76478f29f73cda83ab96b47f4a7aa7aa91e29a8abbf4a8 SHA512 c953bbf3e08f809748a7978a3952604176390d1cd276f187fe096d9bc3c8993b52127e8350c0363387da41318e24b4d1e00ea58df71f3bb8f50c9a5a64cd2d7f
-EBUILD apcupsd-3.14.14-r3.ebuild 4294 BLAKE2B ff87a5d0f38873c6fb0043aeb166f69f6254a5c3b5430b18c4be2f4f618664b164877314ed888c1611172cae0010c25177896bc22a67b02e711aa79ef0230b64 SHA512 363ff52b8f8fe3e68b6857f83f3fd5b2c4b8ff705fb9a2430f9ce6610b2cb72277e6f148fc83da88c1fadad928a466bbefd2028ae4a1310862d4ff6129bb148f
+EBUILD apcupsd-3.14.14-r3.ebuild 4328 BLAKE2B 0122b01f5df11dcf196878fff89dae9d474ee1d6d217d3950c68c7838ec092daba28948abbd7ca80ab16908f2cfc212834e5e463b6a14a79d87fdb325d031dc2 SHA512 dc440aa3540d42383d34b77bce0b18df59faf2de55366aa0f0e1b82de5bb90223cbe8075aa38eb8dca784ad6168f6b894c8c2f359555accb672fe970b1fb5bbf
 MISC metadata.xml 1162 BLAKE2B ff0f026e800ae6f2985d46fdcc2f756e46706b3a1910a3032215996636de9839e0936c5ff88cc7d9e709caf2ad53c9d9b8beca73ca17b8bd4b408c039a0d5696 SHA512 aae2a1aaf01a2412d5e054f8ed93fafb912f8a4cf48d2790615746751091f412f9bf3e19c2d857506ba50ef2a312ad5eec7c2dac770eb0b1130e062af856ab36
diff --git a/sys-power/apcupsd/apcupsd-3.14.14-r3.ebuild b/sys-power/apcupsd/apcupsd-3.14.14-r3.ebuild
index d07f4d82209a..7e9251a07001 100644
--- a/sys-power/apcupsd/apcupsd-3.14.14-r3.ebuild
+++ b/sys-power/apcupsd/apcupsd-3.14.14-r3.ebuild
@@ -118,6 +118,8 @@ src_install() {
 }
 
 pkg_postinst() {
+	use kernel_linux && udev_reload
+
 	tmpfiles_process ${PN}-tmpfiles.conf
 
 	if use cgi ; then
diff --git a/sys-power/bbswitch/Manifest b/sys-power/bbswitch/Manifest
index 7075fb47a209..98f4e95a9e15 100644
--- a/sys-power/bbswitch/Manifest
+++ b/sys-power/bbswitch/Manifest
@@ -1,7 +1,5 @@
+AUX bbswitch-kernel-5.18.patch 627 BLAKE2B 2b7673a82e5d90192667aba1d741353cdc8d9566636a28045b44e5fc130dc0c413a182a2c9b57e07337433fb447efec7b756b68fa94cc0e11eed02f42cf88706 SHA512 c658e0e8de95c678d1a3ea5659344fff9fce14a93e0f8da3f21f79dc9c820feb3c540e1892ffc10a444c96a768d6d3fecd684315988da5f401f5c6ef6f37be79
 AUX bbswitch.modprobe 46 BLAKE2B e76506e79adc57bedd68f038293257e7c70f1f3bc924776741e152b7c95c691f5241066b742583af063a4bdde90134005949ce28715d0b8f0c51f59c582223c8 SHA512 a4fa992d66b401e039c995b64ac5f3b2491c3ccf4412e211d50d1e514253f9341dc77a6d8da808f03988735e44a97bb973f3303ed3c0eeed6f4e21794d3545b6
-DIST bbswitch-0.8_p20200526.tar.gz 15869 BLAKE2B cdeaf539a0996f53d3add215fca1127321b7183526a248340177f4320171b92a5ce531eeedfb1da2f0d9f07c6b61e8cfb635a457406e477640f2e7090b29b655 SHA512 487bcd845d1f462e77b5b9e3f304cd28d0ddfd391ecc36de530a3d18d9d4932bc895ed29972e27006b6f3eeb50c37b523ef786a26b6ee75c19fa55288a496d4a
 DIST bbswitch-0.8_p20211129.tar.gz 15889 BLAKE2B f81343529957603734bc29453ae9513eb5e19a87425adb8975c621357c7caa0f353e06367cc186230adb28f75ae48330a58ba904854415bc118c8573f71566a0 SHA512 e7873ae34aed13e8f4d5709fede763552c28528e853ad02ee4a4377c043f1ce2ae5f7fc3e831ea1dc65f5a1c0a5ddded93b451258b539ed72b0e1c196676a677
-EBUILD bbswitch-0.8_p20200526.ebuild 1155 BLAKE2B cf4f4914b11e0d132d7f333bad291e12df6109efbae5a569e20994ea5c8936a4e71754d8e3fffade9d1bd761f4f0a11064e17a9eaf98e2f3ba6127b276f36fbf SHA512 028378100271cf8cbbb61b1cedd1d196e1de3927147c874be16fb6bb69ba8beebb676a93449f354f1f3f4c1e8186c567ebc4d08c30005dc7b3599fdc06c7ec9e
-EBUILD bbswitch-0.8_p20211129.ebuild 1157 BLAKE2B e983acc931af01609cdddfdeb711b0fff8e06cd50053dc8896f59325266cb08df44ddd58d7a7bada2e87129e1d6fa97edfe0e033027d31d73469988c83806ceb SHA512 c1c71a9932d083a262fb9e2404ccac8af366cbc8e50780fe9ceef09707e7dd175287e0a7046075fe263652750875e99b39a4225783ded585859506996248fc44
-EBUILD bbswitch-9999.ebuild 1157 BLAKE2B b6b77f0ecaf7ac94cc370d498929a8597572c9ecabcda1b817d9e4ceb01d5028d2e7d79f3ee0f5020fbe1d7d7a6fedba9e9daa16cbcf48e60b4a062eaa65e800 SHA512 3c7484b57111e6a78236e75a480472f68a68222e02dd763462197424812d301d0d2ada87290f0b226f2f9825fdc3e583809adceac348a8e6c49dd5816fe10e92
+EBUILD bbswitch-0.8_p20211129.ebuild 1206 BLAKE2B d6c99e136626d00018743ad9a9e23e4eab3a24d7a9f088e8f8877fc76837dadc381b8b4a2537ca3bd64c00a6c6e76c6138d59780471480313dd47077153699d1 SHA512 2f20f9c0009c3d5fa1c578f83f9223e7d33cb7cf60295dd19e8ad69f0ddb74854195f5668377f088303dae73e52bbdf87a2b0b8e7152718cb231166752c46a7b
 MISC metadata.xml 999 BLAKE2B 9d2751b5928195f96c509147b5f6093a0fb3fd39762fb2c4b4509cde94258f35bada1009dae271b06f376e80a544f976495b8a4610ff9044d7cbd3658d942bde SHA512 d715f175dff0e5d5e34b23c5633469f2cdfbc64796cfb2c88c2fa02c39c6ab23b17d93b727ec900a0edc3bd8dccb09a27e598e8705d30b12e4c0a4ed423c9d42
diff --git a/sys-power/bbswitch/bbswitch-0.8_p20200526.ebuild b/sys-power/bbswitch/bbswitch-0.8_p20200526.ebuild
deleted file mode 100644
index 62367166d15b..000000000000
--- a/sys-power/bbswitch/bbswitch-0.8_p20200526.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-mod toolchain-funcs
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/Bumblebee-Project/${PN}.git"
-	EGIT_BRANCH="develop"
-else
-	COMMIT="ddbd243638c7bc2baecf43a78aff46cdc12e9b2e"
-	SRC_URI="https://github.com/Bumblebee-Project/bbswitch/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 x86"
-	S="${WORKDIR}/bbswitch-${COMMIT}"
-fi
-
-DESCRIPTION="Toggle discrete NVIDIA Optimus graphics card"
-HOMEPAGE="https://github.com/Bumblebee-Project/bbswitch"
-
-SLOT="0"
-LICENSE="GPL-3+"
-IUSE=""
-
-DEPEND="
-	virtual/linux-sources
-	sys-kernel/linux-headers
-"
-RDEPEND=""
-
-MODULE_NAMES="bbswitch(acpi)"
-
-pkg_setup() {
-	linux-mod_pkg_setup
-
-	BUILD_TARGETS="default"
-	BUILD_PARAMS="KVERSION=${KV_FULL} CC=$(tc-getCC)"
-}
-
-src_prepare() {
-	# Fix build failure, bug #513542 and bug #761370
-	sed "s%^KDIR :=.*%KDIR := ${KV_OUT_DIR:-$KERNEL_DIR}%g" -i Makefile || die
-
-	default
-}
-
-src_install() {
-	einstalldocs
-
-	insinto /etc/modprobe.d
-	newins "${FILESDIR}"/bbswitch.modprobe bbswitch.conf
-
-	linux-mod_src_install
-}
diff --git a/sys-power/bbswitch/bbswitch-0.8_p20211129.ebuild b/sys-power/bbswitch/bbswitch-0.8_p20211129.ebuild
index 409b02bf015a..2aa21af88733 100644
--- a/sys-power/bbswitch/bbswitch-0.8_p20211129.ebuild
+++ b/sys-power/bbswitch/bbswitch-0.8_p20211129.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit linux-mod toolchain-funcs
 
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	COMMIT="23891174a80ea79c7720bcc7048a5c2bfcde5cd9"
 	SRC_URI="https://github.com/Bumblebee-Project/bbswitch/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 	S="${WORKDIR}/bbswitch-${COMMIT}"
 fi
 
@@ -31,6 +31,8 @@ RDEPEND=""
 
 MODULE_NAMES="bbswitch(acpi)"
 
+PATCHES=( "${FILESDIR}/${PN}-kernel-5.18.patch" )
+
 pkg_setup() {
 	linux-mod_pkg_setup
 
diff --git a/sys-power/bbswitch/bbswitch-9999.ebuild b/sys-power/bbswitch/bbswitch-9999.ebuild
deleted file mode 100644
index 1c9b2ba061f9..000000000000
--- a/sys-power/bbswitch/bbswitch-9999.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-mod toolchain-funcs
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/Bumblebee-Project/${PN}.git"
-	EGIT_BRANCH="develop"
-else
-	COMMIT="ddbd243638c7bc2baecf43a78aff46cdc12e9b2e"
-	SRC_URI="https://github.com/Bumblebee-Project/bbswitch/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/bbswitch-${COMMIT}"
-fi
-
-DESCRIPTION="Toggle discrete NVIDIA Optimus graphics card"
-HOMEPAGE="https://github.com/Bumblebee-Project/bbswitch"
-
-SLOT="0"
-LICENSE="GPL-3+"
-IUSE=""
-
-DEPEND="
-	virtual/linux-sources
-	sys-kernel/linux-headers
-"
-RDEPEND=""
-
-MODULE_NAMES="bbswitch(acpi)"
-
-pkg_setup() {
-	linux-mod_pkg_setup
-
-	BUILD_TARGETS="default"
-	BUILD_PARAMS="KVERSION=${KV_FULL} CC=$(tc-getCC)"
-}
-
-src_prepare() {
-	# Fix build failure, bug #513542 and bug #761370
-	sed "s%^KDIR :=.*%KDIR := ${KV_OUT_DIR:-$KERNEL_DIR}%g" -i Makefile || die
-
-	default
-}
-
-src_install() {
-	einstalldocs
-
-	insinto /etc/modprobe.d
-	newins "${FILESDIR}"/bbswitch.modprobe bbswitch.conf
-
-	linux-mod_src_install
-}
diff --git a/sys-power/bbswitch/files/bbswitch-kernel-5.18.patch b/sys-power/bbswitch/files/bbswitch-kernel-5.18.patch
new file mode 100644
index 000000000000..07cecd4cdf41
--- /dev/null
+++ b/sys-power/bbswitch/files/bbswitch-kernel-5.18.patch
@@ -0,0 +1,19 @@
+diff -u -r bbswitch-0.8/bbswitch.c bbswitch-0.8-5.18/bbswitch.c
+--- bbswitch-0.8/bbswitch.c	2022-05-24 20:26:22.184553495 +0000
++++ bbswitch-0.8-5.18/bbswitch.c	2022-05-24 20:29:00.797008130 +0000
+@@ -264,10 +264,15 @@
+     pci_disable_device(dis_dev);
+     do {
+         struct acpi_device *ad = NULL;
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 18, 0)
++        ad = acpi_fetch_acpi_dev(dis_handle);
++        if (!ad) {
++#else
+         int r;
+ 
+         r = acpi_bus_get_device(dis_handle, &ad);
+         if (r || !ad) {
++#endif
+             pr_warn("Cannot get ACPI device for PCI device\n");
+             break;
+         }
diff --git a/sys-power/cpupower/Manifest b/sys-power/cpupower/Manifest
index 803cec809bee..cec77052dc81 100644
--- a/sys-power/cpupower/Manifest
+++ b/sys-power/cpupower/Manifest
@@ -1,11 +1,10 @@
 AUX conf.d-r2 1616 BLAKE2B 94083b666d5ad43270ec458488b9a6070a33d0d0611a6430e9d44eddc663197cc715c173d1ca1a67a15e012dbd60a08677d85f2e771bbefff7fc9ef4a4b16b88 SHA512 63cd12a4d8782198c71662e9205e346e064b65bae5e3e175b5bc43bdf7ec6ddf675b60349750afe3c37c8a925f9ae9a93530671821342581bd282a69e0773b8c
 AUX cpupower-5.4-cflags.patch 900 BLAKE2B 6ee752113b03bcd9665937eaf1270337baaef7c6d08503373c2d0890a58fe329d4ae3f1fc40dc80cafdbba94e1f41c87d11530855f8f1b26f67c14f63dc54ec9 SHA512 e765ad5141bbffb27ca357a71dd1360636fa5965d4058f209cb6b5ff3bbe7d8f15c270cb6a1f0dfde4bebe47adf96169f1e9dff9a41dceca080229aebc0a1677
-AUX cpupower-5.4-gcc-10.patch 2131 BLAKE2B c31074f0d7626249cf3125fac986370c28eeb421bad6428d697faf4567ef62b3af7fa21b77f88c78784c47caf5f00bf599a6e893f3003617bdf931b14727ba0e SHA512 37fa5c4ee11421aa600e6b552fc31643577fb4369e6fc7c0c1fd51810e8ef8d820399c9ed0a524d48798d96d9e71e2fc28bd0380599b998cd73cea821574ca15
 AUX cpupower-frequency-set.service 151 BLAKE2B ff5a2460bf2080868157ea2b975b9d401f2b47e2c8e77d29ac1528f6b85246394e72d57a88dfacb0242fc1e563eefd0a102d2d6dae877c6e779383a0b163a8f3 SHA512 dcd6bb5dee338113683c2e222df23195857f44f5430569b3c454078d0650c15fa2fa3876dccd6ee4652d0fd409f925205d0d3e57344487a64945c67a3b0dee67
 AUX cpupower-frequency-set.service.conf 41 BLAKE2B b1349f0dc39ee39e7c1442374bd92e069509f106c80206c4a606d732acd2cc6205e2032eb98e4890ef006a8bda5fd65d18b83881aa55008a55375d0bc170efe2 SHA512 d99b78a5ab4f7b4e8fe92bc0b2cd722cd55e97e234027a0eba37eb39739e2a470bfc369efa9cf7846bf1a6d588d9d5d5d9efbb90a68aac2f687ddeb833e291f1
 AUX init.d-r4 804 BLAKE2B b143305b3f117afa49967de098f54419d5f57b86dee7e7153b7adb02331a88d3b90a0a085ee189c0b6de70050de4a1249d481d23816764aad34d416f041f78b3 SHA512 7f6992b17376c0bedb403586e123200272d293b15819260cacd182c19ecdb2da635b177fe3d621ad8605a4ff046fd23669e67ea0bd8f00c9e4339d3ac72d2ddf
 DIST linux-5.12.tar.xz 118112412 BLAKE2B 842d921b9a73d2aaade763dbd2ec67bdfe0275baa6d628b775f5c87574ad7dc86f0419afcd48c10c1235f4bffa16084243f2cf4556e6afcd391e975fe8ba530b SHA512 be03b6fee1d1ea8087b09874d27c0a602c0b04fd90ad38b975bd2c8455a07e83c29b56814aaf1389e82305fae0e4c2d1701075a7f0a7295dd28149f967ec5b3d
-DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
+DIST linux-5.18.tar.xz 129790264 BLAKE2B e2745a69eb70169e90505a9318a3993046eab3020496eecde7d8352ecda0eb71a25b21becf7ce93fc593507dce7d1cd61b94ddcdf82b3094d79c0d3d48508eeb SHA512 dbbc9d1395898a498fa4947fceda1781344fa5d360240f753810daa4fa88e519833e2186c4e582a8f1836e6413e9e85f6563c7770523b704e8702d67622f98b5
 EBUILD cpupower-5.12.ebuild 1667 BLAKE2B 224f33c75a713c6ba64e75c58ebbeb61c76ea939ab3866f33924f7cb566f72aad23d95867d608d479f8d77202672b9e3818b39f28e284aa5c34f99715d590df3 SHA512 be528414367bcf6a3d38edd2b1df17bb637a03af03fd56b708961c3c013ecebcfeab327eb96cd36dccbb4892975f9b206a242d47a7caeaac9501b0c0f1492617
-EBUILD cpupower-5.4.ebuild 1708 BLAKE2B f4c31b98b98ffd07398ba6cc4c392fca3e07fd66fbe62fca312b3d8914fb6e67b6ff4e671c4213a2507f4e332f0b982d273d0c66eaf7f09fc7c0fed862b949f6 SHA512 7c2b8fe451477001a41403f065a069fe85ffdd945198ccaaf7a4193669e78ad27da1908adad114d8dce3d47825031e20e2cd7b40136e00b6a5050f2527442d64
+EBUILD cpupower-5.18.ebuild 1669 BLAKE2B 49c2a60db3ef5d8ae11d6b995864299765968ca5b0d585038c7f290a7cf48c33dde9aaceec60bc90cdb8d48bffc7088f485f9bc55a2921a51cfc6aacd0aa146f SHA512 b9106b7d9aeb367774cf2c945956be3e892014da54bac607fade8e51a12a8e3ddca45f30a31789ef0226c93b5079b1f6232ebf28b0657d312d8c3751a7ca391c
 MISC metadata.xml 341 BLAKE2B ca3076a5e7ee2e834df8f12474fc7bf22bfdbcc8b2734760d2dc30977157dc97e4a0201a6946051fb487833d8891085682d3432c4e941f5ba0241b6fc49232f4 SHA512 a5db2151ec0dd4c0d084f64455406b27387058d61efe53d32718072dac198c0a877618b17350e95a4ae31fa65b672cd4b2f6a966ebe61ec5ec9fe2f6677a0311
diff --git a/sys-power/cpupower/cpupower-5.4.ebuild b/sys-power/cpupower/cpupower-5.18.ebuild
index 821253b9a1fe..c9b2a660a015 100644
--- a/sys-power/cpupower/cpupower-5.4.ebuild
+++ b/sys-power/cpupower/cpupower-5.18.ebuild
@@ -1,7 +1,7 @@
-# Copyright 2013-2021 Gentoo Authors
+# Copyright 2013-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit systemd toolchain-funcs
 
@@ -11,7 +11,7 @@ SRC_URI="https://cdn.kernel.org/pub/linux/kernel/v${PV%%.*}.x/linux-${PV}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0/0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
 IUSE="nls"
 
 # File collision w/ headers of the deprecated cpufrequtils
@@ -22,7 +22,6 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
 	"${FILESDIR}/cpupower-5.4-cflags.patch"
-	"${FILESDIR}/cpupower-5.4-gcc-10.patch"
 )
 
 S="${WORKDIR}/linux-${PV}"
@@ -48,9 +47,7 @@ src_compile() {
 		LD="$(tc-getCC)"
 		VERSION=${PV}
 	)
-
-	cd tools/power/cpupower || die
-	emake "${myemakeargs[@]}"
+	emake -C tools/power/cpupower "${myemakeargs[@]}"
 }
 
 src_install() {
diff --git a/sys-power/cpupower/files/cpupower-5.4-gcc-10.patch b/sys-power/cpupower/files/cpupower-5.4-gcc-10.patch
deleted file mode 100644
index 56540d2bc562..000000000000
--- a/sys-power/cpupower/files/cpupower-5.4-gcc-10.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 8db4ea3227554fb80ad766936a4c21cc901beb29 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Sat, 1 Feb 2020 12:44:30 -0500
-Subject: [PATCH] cpupower: avoid multiple definition with gcc -fno-common
-
-The -fno-common option will be enabled by default in GCC 10.
-
-Bug: https://bugs.gentoo.org/707462
-Signed-off-by: Mike Gilbert <floppym@gentoo.org>
----
- tools/power/cpupower/utils/idle_monitor/amd_fam14h_idle.c  | 2 +-
- tools/power/cpupower/utils/idle_monitor/cpupower-monitor.c | 2 ++
- tools/power/cpupower/utils/idle_monitor/cpupower-monitor.h | 2 +-
- 3 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/tools/power/cpupower/utils/idle_monitor/amd_fam14h_idle.c b/tools/power/cpupower/utils/idle_monitor/amd_fam14h_idle.c
-index 33dc34db4f3c..1b69f25a1281 100644
---- a/tools/power/cpupower/utils/idle_monitor/amd_fam14h_idle.c
-+++ b/tools/power/cpupower/utils/idle_monitor/amd_fam14h_idle.c
-@@ -82,7 +82,7 @@ static struct pci_access *pci_acc;
- static struct pci_dev *amd_fam14h_pci_dev;
- static int nbp1_entered;
- 
--struct timespec start_time;
-+extern struct timespec start_time;
- static unsigned long long timediff;
- 
- #ifdef DEBUG
-diff --git a/tools/power/cpupower/utils/idle_monitor/cpupower-monitor.c b/tools/power/cpupower/utils/idle_monitor/cpupower-monitor.c
-index 6d44fec55ad5..7c77045fef52 100644
---- a/tools/power/cpupower/utils/idle_monitor/cpupower-monitor.c
-+++ b/tools/power/cpupower/utils/idle_monitor/cpupower-monitor.c
-@@ -27,6 +27,8 @@ struct cpuidle_monitor *all_monitors[] = {
- 0
- };
- 
-+int cpu_count;
-+
- static struct cpuidle_monitor *monitors[MONITORS_MAX];
- static unsigned int avail_monitors;
- 
-diff --git a/tools/power/cpupower/utils/idle_monitor/cpupower-monitor.h b/tools/power/cpupower/utils/idle_monitor/cpupower-monitor.h
-index 5b5eb1da0cce..c559d3115330 100644
---- a/tools/power/cpupower/utils/idle_monitor/cpupower-monitor.h
-+++ b/tools/power/cpupower/utils/idle_monitor/cpupower-monitor.h
-@@ -25,7 +25,7 @@
- #endif
- #define CSTATE_DESC_LEN 60
- 
--int cpu_count;
-+extern int cpu_count;
- 
- /* Hard to define the right names ...: */
- enum power_range_e {
--- 
-2.25.0
-
diff --git a/sys-power/iasl/Manifest b/sys-power/iasl/Manifest
index af7cc5344f09..c00c3dfa58b6 100644
--- a/sys-power/iasl/Manifest
+++ b/sys-power/iasl/Manifest
@@ -4,5 +4,5 @@ DIST acpica-unix-20200717.tar.gz 1847795 BLAKE2B 84af34884bbea39aed9ea7ec86f20a2
 DIST acpitests-unix-20200326.tar.gz 2212897 BLAKE2B d88d3d900ac06d165c4a50cddd65495b75db345009b10e76d9f38197ba42efe3ea396ec9828bef62da1fd96ac331d95623c03194e08b00037ff1234321fcf0d3 SHA512 332b4ed016cee48662a5f4572e6d170461f02ee1386109a3970fbe8d104f2a2b14c19235ea43ae9b26e8faf9ef9597cb3d2148e498741361aca62978d0b62189
 DIST acpitests-unix-20200717.tar.gz 2212717 BLAKE2B 939e8022c5ecb7c5e862767f89c0b0de6146e23014dc0100d7dee0f3502e7adcbba72a468c828f804317e75d3a80ba5864c5497a7695f70be0bc1e3dcc69b4e6 SHA512 02c6674cbb2d98f783f25c71b1f391713de6fb3b56e5b57de9a7ccba0927453be4db8aea513e6e7ad491fcf3a0b2c14fefe8a2b82877a2ae01ea1d7832d36844
 EBUILD iasl-20200326.ebuild 3383 BLAKE2B be92aabc8a44fcb803d4b890f0da673f52f31cbc6769720b65209f082f0af5eaff163cbd723dfa1f51c0fb844dcbb6925e88b39ef339d2543857f042b3e1581e SHA512 89c3dd7247fa90c8d3b58085666ed7da18cdadffeabdcbfc9b3e691d795d5a4f07649c84d4af1dee896260edb41139df2aacd3574fa8726ac86e5a9b18727a23
-EBUILD iasl-20200717.ebuild 3387 BLAKE2B 3eab0bd3244f1256c7394ad91dfde7ccedaa5b626ce7af781fc8baae13d0131603358f0a0055078ed99c93656586dfe826012bc80bc5c3ff428df715bd352d16 SHA512 b098e98fb07e6a10e21a7afca2570bae8a9ff1fdb599d0737bf53632dc80552279a0736908aa76fb4a389e557a7e0579665333b663857effffcc4f7af18e3444
-MISC metadata.xml 331 BLAKE2B 70b8df6d6258345330daec6542fc6eb8fcfb6f325be9ac83f40afbce6edda2d0d2341f051a1d99b869b4d0d894f011d77c3f8e2962abb09606403c981a3d7d9b SHA512 2749869555eed71b92a194e6f68579a9b24b58ea6560526d853978946a501ac005a9d5d1837f7d765267b0efa6ab660a0fc2118fcb1838493671602dce3a32ce
+EBUILD iasl-20200717.ebuild 3383 BLAKE2B be92aabc8a44fcb803d4b890f0da673f52f31cbc6769720b65209f082f0af5eaff163cbd723dfa1f51c0fb844dcbb6925e88b39ef339d2543857f042b3e1581e SHA512 89c3dd7247fa90c8d3b58085666ed7da18cdadffeabdcbfc9b3e691d795d5a4f07649c84d4af1dee896260edb41139df2aacd3574fa8726ac86e5a9b18727a23
+MISC metadata.xml 219 BLAKE2B a270ed4d40f32df54032c9bffe34e24cb5c1db00d0084b1c8275595f3fffc3c0fa5518dfcde32b2f8d4b9b0fea636c60679a99bb2636cefc5c7ddf32b5f94a1c SHA512 7bb667bc481064e5afe1856084f0b8bcbcad41a8805d31d29ef5c698598ac615aa11872029ebdbb1eea70e80f2268162f69f0ea6d9b56a4ca5bb76e3d9c8918d
diff --git a/sys-power/iasl/iasl-20200717.ebuild b/sys-power/iasl/iasl-20200717.ebuild
index 4deced324f98..089ecaca7291 100644
--- a/sys-power/iasl/iasl-20200717.ebuild
+++ b/sys-power/iasl/iasl-20200717.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="iASL"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ppc ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-power/iasl/metadata.xml b/sys-power/iasl/metadata.xml
index 583483094280..cdfe9b16ccbe 100644
--- a/sys-power/iasl/metadata.xml
+++ b/sys-power/iasl/metadata.xml
@@ -4,8 +4,4 @@
 	<maintainer type="person">
 		<email>robbat2@gentoo.org</email>
 	</maintainer>
-	<maintainer type="person">
-		<email>polynomial-c@gentoo.org</email>
-		<name>Lars Wendler</name>
-	</maintainer>
 </pkgmetadata>
diff --git a/sys-power/nut/Manifest b/sys-power/nut/Manifest
index 95776677ddf3..e8bcfb1d29cd 100644
--- a/sys-power/nut/Manifest
+++ b/sys-power/nut/Manifest
@@ -11,5 +11,5 @@ AUX nut-2.7.4-slibtool.patch 2470 BLAKE2B 6baadd663f83209f3abbb4a6b83f170df56da0
 AUX nut-openssl-1.1-support.patch 3873 BLAKE2B 17877276e46372aa17d357efc0851b9cdb33b14ac0c40913b47ea513a8ecaa6eebe3241ae8b324583070d76b6c12d3cf18c043778754b5774af846fb8a33b4d7 SHA512 8945f2f663dc50cfd7041cc7f2c4af5cca4b5ef9cfa1be48c122a623e6eadfc511bbaa60a8bd6b68bb2569c75d5f64613d595ad7444b8d6ec9f773d7743872a1
 AUX nut.powerfail.initd 1306 BLAKE2B 9e9c6eb40c6a313ad625136523de730a75b811841331ae5f7dd42b71b65f591c4ab5b8da6e954ceab42da89f4a20e8655cae57354aec6ab796cec80f60ebb419 SHA512 b9aaab526d0996b36a7a6d76a3ee63c1452b0a1bed358e23f6f7f5534e0da7751281428091efc7dba2004706996850ec18318809fdacb94cd8d73ea22bda52ee
 DIST nut-2.7.4.tar.gz 2509831 BLAKE2B 367c687efd739150898a14c700d5fddbe22bf926522923e1842011ec49b67d6638620500c4eda50291feb474cc6eef39fff63764cb3e0fad5898abee981f8308 SHA512 320c4aff85d8a370c5eff77d33924fdfc3caf6a250620693cdd5bf3336b3a80d8a207488eee841bcf8b72fbad68fda4c074e63b99c56e7886716fc934122d11a
-EBUILD nut-2.7.4-r8.ebuild 8843 BLAKE2B 32cd858e8a205c589a0414d95f04734e0b2a865584300560b4a54e644d8e07317966c977580e5979b7d07c114d7bc9a2444e0d52637e86505e99f57d2a021393 SHA512 d3135c9b7327c3e70ff28ec6edcc4c0464ab9fa0351a809a922454ddb9c4f3cea704ad8f2c746f021cb426547b554f41147942ed7141c97ab46897705efa3276
+EBUILD nut-2.7.4-r8.ebuild 8850 BLAKE2B 0e298891877dae79a3612cb37d4596c164e36d84d072b130b94861e429b700e0f103c1a1245a3a996dba06d2c2912f4847bccbc6db1a717f759f3ae890cf794c SHA512 79090443c160dc043f88417d6500dd49ee3427a4e685bf86ce6b653d324eaf67425e5fd96acb72d8d59348e264f9ae0b2c514be3999fe81a17c9cb1d94f63866
 MISC metadata.xml 5273 BLAKE2B 8eb36ab7d2c0650fc0fc69cb33a5f845b6adbff85cb6f1d9f3359286d125281a26e6864a3fc57171cec40cce2c82d0d7c7525ab35034cbae1d054b37fee0f3c2 SHA512 1d9653333532ca5090aa8ab5f66c18d46b8c7df2b75fd42b6d55ff252f7596122bf15302c3d5bf8a3dcbe9a1795f4af845c36e2160ee377bbe05ca4031366900
diff --git a/sys-power/nut/nut-2.7.4-r8.ebuild b/sys-power/nut/nut-2.7.4-r8.ebuild
index 7dd1503984cd..52ae7661079a 100644
--- a/sys-power/nut/nut-2.7.4-r8.ebuild
+++ b/sys-power/nut/nut-2.7.4-r8.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.networkupstools.org/"
 SRC_URI="https://networkupstools.org/source/${PV%.*}/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~ppc ppc64 ~riscv x86"
+KEYWORDS="amd64 arm ~arm64 ~ppc ppc64 ~riscv x86"
 
 IUSE="cgi ipmi snmp +usb selinux split-usr ssl tcpd xml zeroconf"
 
diff --git a/sys-power/upower/Manifest b/sys-power/upower/Manifest
index 96537360d24f..bcd01e966b46 100644
--- a/sys-power/upower/Manifest
+++ b/sys-power/upower/Manifest
@@ -1,7 +1,12 @@
+AUX 0.99.18-meson-Allow-unittest-inspector-to-fail.patch 998 BLAKE2B ac9e7f5ebeb3afee70fe94738300b389d9531f7f21a091200169c6d32252c2302873ae5e1bf57680e50dc80bff896341793aa3fa4c9db6b3a801bad43d73eb73 SHA512 fc72d4f9e1913bf24d28ce7a5972172ae690baf995d0e7fd75d74f0289d5feb740a704d234745138bb78230a9bedd285b5032cb8bcd79978bf6b18b55fbacbbe
 AUX upower-0.99.12-fix-power_now-energy_rate-readings.patch 1636 BLAKE2B e61167d5a1f6b65cdb611f6cf7b9b5879de58d692176079041a785ca6ecf799b728b32a37e0e3ed7cb0ad06e03db2f16c3eac84d3879398f9be8d9f4fff22d72 SHA512 7aa880a8fd6887a0a9e7d118ef7fa2cde59f9d9b1f16dec17ac7ac013346f9e06f9ae55c343b7830b370f500da201cd2b107f8f586f90d4f7b5695fd33389565
 AUX upower-0.99.17-meson-Don-t-search-for-gtk-doc-if-disabled.patch 1656 BLAKE2B 6fe3a2bbd6d61a034b6787fc394b74c5d76e414e207e37ebd9921f2f681b8aab145a53dc072565b581e6cc5bdd9f9972d6036dfed5f70edad8a4db4996f4c4f3 SHA512 ee36f0fa1ac75ba01c7c6829d5b29f868a746243f33e5513795a090659cea8f2a7085967c0a7832a979adce490d169ed7c4a79860c228ec07f3e06f90dff0dc1
 DIST upower-0.99.12.tar.xz 423640 BLAKE2B 4c5c6357f0a2f8d721ebae9736912b1871a898c7ce65708626f9a9465cde87036ba6ab8050d97f5b9074d92e2700d8ed1e71b67f43cd6305eb4e89336f1b628f SHA512 9858a0e5f65271522cc5f36b0cd8722a5fb3effba37dbc5b22f08606701d4242ee54329d07460768004a24dc42705a84140ac6d9691afb7f09584b2e61fe3413
 DIST upower-v0.99.17.tar.bz2 139108 BLAKE2B de48a8058752f3e2bcefe83fe049ae9181517276f6d2930c402089291d935ecbdc6f7759d811467c537801c422f5d32a02366f3e3d57bea9e73e311b13df046a SHA512 fcb2f344e82f04af85eee3a4ef42a4d119f7b55fd4e1c6bc2633845135bf524957b54c849bf6501d89cfbd285a7e1fbeecb8e846aa108e2b36d1550347150c04
+DIST upower-v0.99.18.tar.bz2 141140 BLAKE2B 2e6acfaf58f6e0031326c269ad58bfcdac84a25f952ef3169e6ee85889696c5c83d10aaf67b8244a2378150fd591ddbd3101d21d1e7534e5d7f2f69ee070a174 SHA512 f33a2ca35209d69fa7ddf614c6a390973c998c6473448acb00ca86114f7bfc05beb8f904010ed7b5a440209fe503e759682459893fdc9690c4b79d516e7f9de1
+DIST upower-v0.99.19.tar.bz2 141661 BLAKE2B 4c117927d17f118cd06165160b407190ab86fff6bc194204038fd334dc879726c1f83fa23c89c2574cf8de6211ce6a884cc103f8292618818b1bc60e5ba8f1e8 SHA512 1462a64bc642bd6c5c235742f5a8fa9e3440846d90061889b568fc0a91f7b24d56d1f5a3d33bff8d6d35f78aa8bc8c15f9c4a51a2cb40f1ee3b2a822ad60ca33
 EBUILD upower-0.99.12-r1.ebuild 2705 BLAKE2B 4da66afcf8ad299b2cbe201d9f54b514bd912fdadd2c616e061d89d571834c2e71fa5a32258268ecfcf02984c4727edafb122f470f9140bb260c734c14513bd8 SHA512 f5961f9aba9d120646c643641a49fcf8e670543bbeee3670f36b06e41a3a675baaa6b426274ba9801ca446f67d7f39588955a877c225c2b98cf1144b1b21b366
 EBUILD upower-0.99.17.ebuild 2890 BLAKE2B 7cbb2e63443639c494b2e98d1ff64ac7c08d0c2775ca86382f53794196e8f02ac8598aa989c0e6f734f2889d8637f8586932fb5c5d12b757861bce8dec20f562 SHA512 738c340c727c4d57603c25bca273b1a06de64357d04f55089f0eb97369cedbe06804c67639f31a50ab76145774a5257fec4bff95c81d0c291019cc15206f1cff
+EBUILD upower-0.99.18.ebuild 2894 BLAKE2B 4e1d7b4aa402aee936ad2bf9b8ea57b6e2e1984418d1fdd2deecb34665ae0fbcf553915bc30ee9a0560ff54ab5dbd23793544c6aa155bf15c1e87927fe379e25 SHA512 9c6c534afa3878febf6d4c29442e71f587e40653fb48a1336358402a22c4129b621a01282a7faf96a7b5a69e1b42b2d6d5da35eab6885116f972f350388fadee
+EBUILD upower-0.99.19.ebuild 2853 BLAKE2B 63464a80f4cb8303e7928c66719a96e830e85076b3d5ec62b4014b362f338655dc428327e9cc830e84a62a1886754e50a09f13874d96ab862af8baece37ef699 SHA512 15c86382c895ca74cb82bc396a92494e2658e873d995fdc267dfb7b7b9183c874801b41f1814b73070c63e18e3cce7dd5f636206fe2c593bb947f092110e4ba0
 MISC metadata.xml 229 BLAKE2B 35bd897953d3051382021de0742162ed1a166c98224fec04fc54dc467dfe5492289b1da910ae9213259b20a0bd5bbffc041624ccb3aacc23b56de2c397861d7d SHA512 7340f6b8c0a938920b7940a288c212e868ae0d8cb18b97c028e6e959f72f94e35f37a2d864bb662fc1d01b43bd7b72efdcbcc5d48e700aaf8c845eb6b9d67fed
diff --git a/sys-power/upower/files/0.99.18-meson-Allow-unittest-inspector-to-fail.patch b/sys-power/upower/files/0.99.18-meson-Allow-unittest-inspector-to-fail.patch
new file mode 100644
index 000000000000..feafa87e9705
--- /dev/null
+++ b/sys-power/upower/files/0.99.18-meson-Allow-unittest-inspector-to-fail.patch
@@ -0,0 +1,31 @@
+Bug: https://bugs.gentoo.org/848525
+
+From aa646fa0ca3e164b09949c546796ec50433b748d Mon Sep 17 00:00:00 2001
+From: Benjamin Berg <bberg@redhat.com>
+Date: Tue, 17 May 2022 16:02:49 +0200
+Subject: [PATCH] meson: Allow unittest inspector to fail
+
+It is only used to make the test output nicer, and it is completely fine
+to fail.
+
+Closes: #187
+---
+ src/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/meson.build b/src/meson.build
+index b49d5f0..2e1edd1 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -124,7 +124,7 @@ if os_backend == 'linux' and gobject_introspection.found()
+ 
+     python3 = find_program('python3')
+     unittest_inspector = find_program('linux/unittest_inspector.py')
+-    r = run_command(unittest_inspector, files('linux/integration-test.py'), check: true)
++    r = run_command(unittest_inspector, files('linux/integration-test.py'), check: false)
+     unit_tests = r.stdout().strip().split('\n')
+ 
+     foreach ut: unit_tests
+-- 
+2.35.1
+
diff --git a/sys-power/upower/upower-0.99.18.ebuild b/sys-power/upower/upower-0.99.18.ebuild
new file mode 100644
index 000000000000..760dcd025ded
--- /dev/null
+++ b/sys-power/upower/upower-0.99.18.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+inherit meson python-any-r1 systemd udev xdg-utils
+
+DESCRIPTION="D-Bus abstraction for enumerating power devices, querying history and statistics"
+HOMEPAGE="https://upower.freedesktop.org/"
+SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0/3" # based on SONAME of libupower-glib.so
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+# gtk-doc files are not available as prebuilt in the tarball
+IUSE="doc +introspection ios selinux test"
+RESTRICT="!test? ( 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:=
+		)
+	)
+"
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-devicekit )
+"
+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? (
+		$(python_gen_any_dep '
+			dev-python/dbus-python[${PYTHON_USEDEP}]
+			dev-python/python-dbusmock[${PYTHON_USEDEP}]
+		')
+		dev-util/umockdev
+	)
+"
+
+S="${WORKDIR}/${PN}-v${PV}"
+
+QA_MULTILIB_PATHS="usr/lib/${PN}/.*"
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-meson-Allow-unittest-inspector-to-fail.patch
+)
+
+python_check_deps() {
+	python_has_version -b "dev-python/dbus-python[${PYTHON_USEDEP}]" &&
+	python_has_version -b "dev-python/python-dbusmock[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	xdg_environment_reset
+}
+
+src_configure() {
+	local backend
+
+	if use kernel_linux ; then
+		backend=linux
+	else
+		backend=dummy
+	fi
+
+	local emesonargs=(
+		--localstatedir "${EPREFIX}"/var
+
+		-Dman=true
+		$(meson_use doc gtk-doc)
+		$(meson_feature introspection)
+		-Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d"
+		-Dsystemdsystemunitdir="$(systemd_get_systemunitdir)"
+		-Dos_backend="${backend}"
+		$(meson_feature ios idevice)
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	keepdir /var/lib/upower #383091
+}
+
+pkg_postinst() {
+	udev_reload
+
+	if [[ ${REPLACING_VERSIONS} ]] && ver_test ${REPLACING_VERSIONS} -lt 0.99.12; then
+		elog "Support for Logitech Unifying Receiver battery state readout was"
+		elog "removed in version 0.99.12, these devices have been directly"
+		elog "supported by the Linux kernel since version >=3.2."
+		elog
+		elog "Support for CSR devices battery state was removed from udev rules"
+		elog "in version 0.99.12. This concerns the following Logitech products"
+		elog "from the mid 2000s:"
+		elog "Mouse/Dual/Keyboard+Mouse Receiver, Freedom Optical, Elite Duo,"
+		elog "MX700/MX1000, Optical TrackMan, Click! Mouse, Presenter."
+	fi
+}
diff --git a/sys-power/upower/upower-0.99.19.ebuild b/sys-power/upower/upower-0.99.19.ebuild
new file mode 100644
index 000000000000..5554b4d5e0a6
--- /dev/null
+++ b/sys-power/upower/upower-0.99.19.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+inherit meson python-any-r1 systemd udev xdg-utils
+
+DESCRIPTION="D-Bus abstraction for enumerating power devices, querying history and statistics"
+HOMEPAGE="https://upower.freedesktop.org/"
+SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0/3" # based on SONAME of libupower-glib.so
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+# gtk-doc files are not available as prebuilt in the tarball
+IUSE="doc +introspection ios selinux test"
+RESTRICT="!test? ( 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:=
+		)
+	)
+"
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-devicekit )
+"
+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? (
+		$(python_gen_any_dep '
+			dev-python/dbus-python[${PYTHON_USEDEP}]
+			dev-python/python-dbusmock[${PYTHON_USEDEP}]
+		')
+		dev-util/umockdev
+	)
+"
+
+S="${WORKDIR}/${PN}-v${PV}"
+
+QA_MULTILIB_PATHS="usr/lib/${PN}/.*"
+
+python_check_deps() {
+	python_has_version -b "dev-python/dbus-python[${PYTHON_USEDEP}]" &&
+	python_has_version -b "dev-python/python-dbusmock[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	xdg_environment_reset
+}
+
+src_configure() {
+	local backend
+
+	if use kernel_linux ; then
+		backend=linux
+	else
+		backend=dummy
+	fi
+
+	local emesonargs=(
+		--localstatedir "${EPREFIX}"/var
+
+		-Dman=true
+		$(meson_use doc gtk-doc)
+		$(meson_feature introspection)
+		-Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d"
+		-Dsystemdsystemunitdir="$(systemd_get_systemunitdir)"
+		-Dos_backend="${backend}"
+		$(meson_feature ios idevice)
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	keepdir /var/lib/upower #383091
+}
+
+pkg_postinst() {
+	udev_reload
+
+	if [[ ${REPLACING_VERSIONS} ]] && ver_test ${REPLACING_VERSIONS} -lt 0.99.12; then
+		elog "Support for Logitech Unifying Receiver battery state readout was"
+		elog "removed in version 0.99.12, these devices have been directly"
+		elog "supported by the Linux kernel since version >=3.2."
+		elog
+		elog "Support for CSR devices battery state was removed from udev rules"
+		elog "in version 0.99.12. This concerns the following Logitech products"
+		elog "from the mid 2000s:"
+		elog "Mouse/Dual/Keyboard+Mouse Receiver, Freedom Optical, Elite Duo,"
+		elog "MX700/MX1000, Optical TrackMan, Click! Mouse, Presenter."
+	fi
+}
+
+pkg_postrm() {
+	udev_reload
+}