gentoo auto-resync : 03:05:2024 - 00:00:22

6 files changed, 50 insertions, 3 deletions

diff --git a/sys-power/Manifest.gz b/sys-power/Manifest.gz
index 94e2f3e35824..4fb6975c335c 100644
--- a/sys-power/Manifest.gz
+++ b/sys-power/Manifest.gz
diff --git a/sys-power/upower/Manifest b/sys-power/upower/Manifest
index 135b59832b6f..cebaf417f7d3 100644
--- a/sys-power/upower/Manifest
+++ b/sys-power/upower/Manifest
@@ -1,5 +1,6 @@
+AUX upower-1.90.2-backport-pr207.patch 1549 BLAKE2B a682f9fe09c9df49ba2ff038fbbd649b1a9e1cba6ab148fdca30b9cc708f151bf6ae47655a90a49e67ace48ad847730923ae12c98869e93509fcc1900568b9f8 SHA512 2ecf1211e9185af0f8cd92c982f334dda9e4916f50f0a087802bf01fecc7e6926cda6562d581a328f9f2560d0d42a4f09837fdbc82524491cfd7cc721ac8dff8
 DIST upower-v0.99.20.tar.bz2 126098 BLAKE2B 670a2ad746c5cf8b2aca332f1f8c36fc96cd82b3ad8a7a5337dd3edce60cd73b1a83e807ec3f257d5216b3b4873f1bcf6cc9c434c195f75680e891c653f44fe1 SHA512 50e5b03f1319da3869b0caba4fbe78c8eabf1df6f783f1463b06394bee58bae42ad411780faa503965c5fdb983d723c0b5ae0731fae4220997a17875f4850b1e
 DIST upower-v1.90.2.tar.bz2 138265 BLAKE2B f00b3a584f5564a0edc7fadad2e005da5938e61005c0c84ed6bfb9e612a5964a1f4b0a051a2a78eb1b71666e4182ce2e01e16f1b32269ed2db848b570f71fd09 SHA512 9cdaea76d604e79bb385c2d7d8df26ab74d8fbbd5ddd271d7dc3323ae4f98ce9504ce807638e008869fdec0e1fcaf8d4be53e486714913616b8df73d8e4ac396
 EBUILD upower-0.99.20.ebuild 2794 BLAKE2B b6d2482072d87a91d3e22a78ba5909c3cb08cc761eec4c276c59405a9bd3a1ab01b38eacc870bc0411ac34c243f6d49dba82f8da9f597a89d5f7970fe125cbc3 SHA512 d21cc207336b1ff3e033a375b3b8bbbb5aec847aeb54d1982bb2a01bbd04c96acd9b8d42a8009aadfa4883dd1641152038c5821b140aba9844d943d8bba43aa8
-EBUILD upower-1.90.2.ebuild 2807 BLAKE2B 0baeac23da1d5d32ded1779bcf8a3c7a4969bfa262194adcd1c32160192ef1bf97f60d5b964fef84262a329ecd2a148f39eb6ba72f865c5c33c77cf048ffe817 SHA512 9f969052f37f2159eaf25a3e18c849417c9c7f3f2bfbabda6707aacba068aabfc12e043b66b5c8f6cc114fab8b52e4eae555c9fa6a242e06d4215748fa5ea0c6
+EBUILD upower-1.90.2.ebuild 2868 BLAKE2B 837f5a6e1293dbc58bb854a03f55f6743d8bf61adb5285cce4e6ae52107f07def48dfe943e0ee5570c80f34be9f5a50e3fec49454101d0710b3db0ea56f6feb1 SHA512 8350b522953c0ce8e1b0f99dc76891770e590d8a57ac075d86a41be9159efa7a9986d4e273e50f726ef8a41e3e797728983108ab851ae0801e2a68769ee8dca4
 MISC metadata.xml 319 BLAKE2B deed435a52138ca25bc6db202a294303839a6be54e3c257f25e25b8050ae30992fd18054cf568bcfd33e14211523a328546cf9732fc10844437994fa79e3f63d SHA512 47a7e588aee976740610165259518b427b425dc9aaff3afd74d4abb34717dd4ca23c0d062347a1257e192a56ce16d7793d4d58738d0cfd178adcc55992136194
diff --git a/sys-power/upower/files/upower-1.90.2-backport-pr207.patch b/sys-power/upower/files/upower-1.90.2-backport-pr207.patch
new file mode 100644
index 000000000000..dd47e4c8926a
--- /dev/null
+++ b/sys-power/upower/files/upower-1.90.2-backport-pr207.patch
@@ -0,0 +1,43 @@
+https://bugs.gentoo.org/923794
+https://bugs.gentoo.org/927405
+https://gitlab.freedesktop.org/upower/upower/-/merge_requests/207
+https://bugs.debian.org/1059467
+https://github.com/martinpitt/python-dbusmock/pull/192
+
+From bd1e4698f480c6b94afa0536fc02e211ae5a87fb Mon Sep 17 00:00:00 2001
+From: Martin Pitt <martin@piware.de>
+Date: Thu, 28 Dec 2023 21:13:15 +0100
+Subject: [PATCH] linux: Adjust test_bluetooth_le_device for dbusmock 0.30.1
+
+dbusmock 0.30.1 changed the BlueZ template to set the default "Class"
+property to `MOCK_PHONE_CLASS` right away instead of in PairDevice() [1].
+
+test_bluetooth_le_device() relied on the previous implicit default of a
+"0" Class value. Set this explicitly to expect a "generic" device. This
+makes the test work with old and current dbusmock versions.
+
+https://bugs.debian.org/1059467
+
+[1] https://github.com/martinpitt/python-dbusmock/pull/192
+---
+ src/linux/integration-test.py | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/linux/integration-test.py b/src/linux/integration-test.py
+index e6861253..4c071e85 100755
+--- a/src/linux/integration-test.py
++++ b/src/linux/integration-test.py
+@@ -2162,7 +2162,9 @@ class Tests(dbusmock.DBusTestCase):
+ 
+         alias = 'Satechi M1 Mouse'
+         battery_level = 99
+-        device_properties = None
++        device_properties = {
++            'Class': dbus.UInt32(0, variant_level=1)
++        }
+ 
+         devs = self._add_bluez_battery_device(alias, device_properties, battery_level)
+         self.assertEqual(len(devs), 1)
+-- 
+GitLab
+
diff --git a/sys-power/upower/upower-1.90.2.ebuild b/sys-power/upower/upower-1.90.2.ebuild
index d07fa60bc00a..8b5b884e28e6 100644
--- a/sys-power/upower/upower-1.90.2.ebuild
+++ b/sys-power/upower/upower-1.90.2.ebuild
@@ -51,6 +51,8 @@ BDEPEND="
 	)
 "
 
+PATCHES=( "${FILESDIR}/${PN}-1.90.2-backport-pr207.patch" )
+
 QA_MULTILIB_PATHS="usr/lib/${PN}/.*"
 
 python_check_deps() {
diff --git a/sys-power/wluma/Manifest b/sys-power/wluma/Manifest
index e3172897f2f3..d73ec11dc337 100644
--- a/sys-power/wluma/Manifest
+++ b/sys-power/wluma/Manifest
@@ -280,5 +280,5 @@ DIST xml-rs-0.8.19.crate 54051 BLAKE2B 667358226fd5fa1829110ee9b587dae7d95fe1f01
 DIST xml-rs-0.8.4.crate 52690 BLAKE2B 140d4e725ae0e82c949838c1f6d82e1fbb00e2df4d51b74486597302d4a434ccb46bbd6f5e97636b4947c0092793928c29837a3290bb525344e8a27c0951a42b SHA512 b21b0db9ee7cdfddae7c110e4fec714d719e75ba139744c290692d660caa425aa8b1ece644deb5f1879f21c0561b9b412b9ba8931f7f5b4e220ef08f8a7fc5e6
 DIST yaml-rust-0.4.5.crate 47783 BLAKE2B 3e888c5cc7afb43eaf3aaab2b6f47b86df164a66eb54d4e166b965cc84b1e06cd17bd992a0d6ee175d9a73a76e2b44a13167246383ed054afcf3cc1710b309cb SHA512 7621dc8dfd5e7d4a7a8805b2a7e8319b63b852367655f2359d4e3e8fec6c4fad52d75c46ce1161e4c674eac0780b757ce9d34e664e304d8d2beec7afa0363ea0
 EBUILD wluma-4.3.0-r2.ebuild 4302 BLAKE2B 0ef6a3e82fdaee1154e906c869138e108f15c428ee4dce160eba9e36607346e6265ae99f618006be0f7221e00ddef2b381c8aa25f6e60cbfd0e431d060ffd6de SHA512 c99f4a091489145b4643699c3cd76f45c6a4383b174a7c85978c01412a06529c760d0189640a737af860c18594d30ed040a8e2f04db31695a2e1f43baf414066
-EBUILD wluma-4.4.0.ebuild 4364 BLAKE2B 72b252d481d8c9bef930db35040fd5de77dc354d72f7d43dc5c1846d90a8f65c56399ea6feff7d068954f7e848e56e0e6edd779cae95dd07a6f24f27f95a6360 SHA512 b4f3bf486aabd25e53208cce2d1eacb72f90c29512ddd1edb95e833884dd29c41b3be4b373feb44b030212e989276856d39e42ba039b426e3487da4a64321c02
+EBUILD wluma-4.4.0-r1.ebuild 4408 BLAKE2B f7cee472c376a807814d2cf193b5b755b42eeffa7c6bb6688b15584093980b8af389ef1bc254b081caa47048bdb22f81d4d8096ecd1c46ca5d9ee92696547a01 SHA512 4201aff28815e16ed150dfcd3484dbb3d21bb1aa86f9d42806653e82bad4dfc90a1ac35d8fb1287a82d263441545e2535783a1fa74399d76f38ff183a3c27047
 MISC metadata.xml 329 BLAKE2B 8fb561f04494fa1c7bbce0dfd4c55133d192c6ac66381dfd4b11613cc5d9767308bd273bc481813efba1ef8d9f6baaca289724f090342f91ad3dd36badc86724 SHA512 df07060413f3289a6ea3f1a63ed18d8d857152a3a4f6760162e61d9fa963b74b6539ccc293f75a0eebed38e140fbf1c8374acebeee4b22620c9fa1d477f62e81
diff --git a/sys-power/wluma/wluma-4.4.0.ebuild b/sys-power/wluma/wluma-4.4.0-r1.ebuild
index d3c638149b07..dbaaedafd98b 100644
--- a/sys-power/wluma/wluma-4.4.0.ebuild
+++ b/sys-power/wluma/wluma-4.4.0-r1.ebuild
@@ -186,7 +186,7 @@ CRATES="
 	yaml-rust@0.4.5
 "
 
-inherit udev cargo
+inherit udev cargo systemd
 
 DESCRIPTION="Automatic brightness adjustment based on screen contents and ALS"
 HOMEPAGE="https://github.com/maximbaz/wluma"
@@ -219,6 +219,7 @@ src_install() {
 
 	insinto /etc/xdg/autostart
 	doins "${FILESDIR}"/wluma.desktop
+	systemd_douserunit "${PN}.service"
 
 	insinto /usr/share/${P}
 	doins config.toml