gentoo resync : 29.12.2022

5 files changed, 11 insertions, 121 deletions

diff --git a/gnome-base/gnome-settings-daemon/Manifest b/gnome-base/gnome-settings-daemon/Manifest
index fc02dd9aed01..034f22360c48 100644
--- a/gnome-base/gnome-settings-daemon/Manifest
+++ b/gnome-base/gnome-settings-daemon/Manifest
@@ -1,11 +1,9 @@
 AUX 42.1-build-Make-wacom-optional-and-controllable-via-meson.patch 1759 BLAKE2B e734dfb341143f3f246d268ff479a528fa09d6c5e496611e06e4ffea914098349eab2b2c5a4a55e8b47e5032b68bf6b929b76a1aa899402953cdcc1d3cf0589e SHA512 faffde0cd940ac6a8dabdab09ea38bd126e11822e75df5adf1a0bb3b055135a8c52abbb6ecb4d71476899ec0c5d8a78ba0075cb84cfebafe6c3aa5310dfca308
 AUX gnome-settings-daemon-3.38.1-Allow-udev-optional-on-Linux.patch 4505 BLAKE2B a61199b8da339dbe9bbe7e8941a56958f5a69fafeb95c6f7027c483e35b193854560ad12f2df45dd8374db1abcefd9bfb8dae5b5381be3215755f907a73726ec SHA512 468a73b69f441886d1ce5e0e5f263ea695170a3610f6124100e3eaed1d8dd62c3439193461620d6f8b18c81d2066163ff2c1839194ebcfeec424868163f46997
 AUX gnome-settings-daemon-3.38.1-build-Allow-NM-optional-on-Linux.patch 694 BLAKE2B e4f32a376c2b1c55a396504e98c8a69d512bb9161a854482aa877023a2761e59d3fc682d724398ffb53bc138b010c33276071359d42ac19bcac2d9af87d42eef SHA512 618ad312b54709d0f95e5d881c2896c156246ae41eee1925f76b0a398b7ce6815a7466f8587f2291b07f7a34d1a3e1afb7df33823d9b52ebe8ad46a3f5f1e84d
-AUX gnome-settings-daemon-3.38.1-build-Make-colord-and-wacom-optional-and-controllabl.patch 3096 BLAKE2B 44587b5a73c5c1a622a8e5a422f03da414856e79edce30056f56fe93a7dcea0ca5a84be737de7fe723f023bb65714d589f60819667432109a212fc03ec4c7b68 SHA512 5ebfd528f7c446c02bf2c4160b91600e7dc27a3f6c17fec071ab9a72c6e4fffc3ba81427bdf7ba10d19cb5059238ec798ab136711018bd3269bbd658ed1c0632
-AUX gnome-settings-daemon-41.0-meson-0.61-build.patch 843 BLAKE2B 0f922f7f35e6801795508d5cabfb388e091c436f97d4745eb93fa5f0ea71d53f73c341315f65d4af1855bbef08555201fd38cc01e6e2fcf32d997fd0f1e2dae8 SHA512 2eda9c6e9a2c5cd82dc16a95b8f8043db47f996b27f3c2d3d30b56476d5f5cd8fb125e31ea622d0efabdeb76d769050e33bbd41d97376fc024ab36919d5ac9c2
 AUX org.gnome.settings-daemon.plugins.power.gschema.override 75 BLAKE2B 1c80bbb15e998de9f5fddc956dab862552ecc3734083391f124ef577dd2efb70e29efd230511cca83536dcd8c32118ecebcfe52b2927d6f0094540ec73a6ae23 SHA512 9c4b1e1b63b1a6d97eed962969704accca2fc53763a4b7806e2a3e4ff49ecc7d4a0d7f8253ff2e33d83e766908d852721ffa33f363aed7d04c20002bfdee173b
-DIST gnome-settings-daemon-41.0.tar.xz 1477876 BLAKE2B f17005b03cbee142434f0805e8f590d6d9edad0f09b3226bb40ab7e312ee13bcd46c211efb140303d4a351d8818238a28bd9aa3fe760fb617fb006e97eebde61 SHA512 2c6848a749f84fd0c3a9ade6f4a83ae3ff7464da429b2d73030c9dcbd278b070c40475c678c819e31464941f2bd38d81f11b96f24d0d1fb05271267c3a1ecc2a
 DIST gnome-settings-daemon-42.1.tar.xz 1481432 BLAKE2B d045b2e2a17c6c54f0014db03e1b2d645086d907383b849de82f972af39463acf06ab1207817f171fd3b7a33b60303d058f04495158bb49aab7899da740f732c SHA512 20e87fc2318d77af016ec071cc6070f43ac42eaaf60a1f9bdb4278f59e038268e0a37759f0ab31068d8701b9dc64d142c0a875f0eeaa700ad47e0dbca3b9d141
-EBUILD gnome-settings-daemon-41.0.ebuild 3954 BLAKE2B a1e545560d68d18ed28bf025197b2998756ef08219727acd547e652dfed4573961307741eac8cb3a7021c9edd7adcf18bd281737e8330195457705f4d051fd02 SHA512 b8ef84e4dc1294b9dd4c9e1a0dc24b6406292e78b3e7276c9d407933aeb6d844ed8e67a3ff734e2df1118f75954aa34c3a324e9462e685b60ee44cd0f6571103
-EBUILD gnome-settings-daemon-42.1.ebuild 3910 BLAKE2B 777dcb7e34c39976e3cddfe9ca4e4f5faf22d638c668f7a5af3ebe9c2c44c894524fb61efc0b629163c96adb64189f6314eb31b759b03f62d89e215321958014 SHA512 3c09129d05c6437decf691b07252af19231b3bd9a503b24629e4085b4a398a0a9a2b01822925a80234bb91b0d1cd9593fbec67c68faa457760be70d9a044f74f
+DIST gnome-settings-daemon-42.2.tar.xz 1483864 BLAKE2B c2051f129e66df8ca55eb72b0c3a037275c89d3c519fe01822aa4ad2309af9a27e840f4f797a8ecac8e0767d8e7894ffe9c5942840b0ca57536325e3cbe12617 SHA512 66f1e766a7d1c36d4609c9505ba5d99516505ecfc5123483a3cbc6189d21cce23abf26da067bf9c05c3c25bc96d4568a8b07477f0722b0cb9442085f6d886e5c
+EBUILD gnome-settings-daemon-42.1.ebuild 3907 BLAKE2B 17b1f98a007a8f0fc2963525bc7c9c13732c00b6ce698d17bde31a8791b45ff2a2ae4fb381d3f91f8ef3736878d4427e3e5659a2eb7b045703fdaec7842a92c2 SHA512 ebf63538d7317c8bb81a0191df08d3902033402154b49fc54c4633be3e6e931a08191b09a83c2aae77e9e6c479cd9717fcd41e4c3a974a46e844199ca32040d1
+EBUILD gnome-settings-daemon-42.2.ebuild 3923 BLAKE2B a6518745a4f0b9d29909cf22f1f7b3f539fe0e1fd83038322ff9000ee3db5012c772dbbfce745a800095228a785868c907312b35bc53760b57b413130a04b674 SHA512 ea4043e1ca81e92076d7a54465f9286ae26fddf458d98bab5eaffbe63f5ba52249af7babd44e3c7d9180e2ddba4685bb4065d423710103ee7f4fc012202da3ab
 MISC metadata.xml 547 BLAKE2B ef7c1ef4b899bd7ba6f1d05b725a5c2205e949d03d41ae4922559e740fd94ecf767c25da34a9a45a4da796e336133ed250f675a525fec9db5fb53c4c7df35dd4 SHA512 ddc99a174f19c7c949cee4d130082572bcf71dc9c50d637cd94ea0f3609b9d032ff603552c2b077245cadc6cf03f8726cf81efe89fbf2e8b3e5293dcc572005c
diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.38.1-build-Make-colord-and-wacom-optional-and-controllabl.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.38.1-build-Make-colord-and-wacom-optional-and-controllabl.patch
deleted file mode 100644
index b48007d29848..000000000000
--- a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.38.1-build-Make-colord-and-wacom-optional-and-controllabl.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 0cc1c2f5f5d12169acbb965a21b5d9f6fb4a0767 Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Thu, 14 Mar 2019 09:43:00 +0200
-Subject: [PATCH 1/3] build: Make colord and wacom optional and controllable
- via meson_options
-
----
- meson.build         | 10 ++++++++--
- meson_options.txt   |  2 ++
- plugins/meson.build |  4 ++++
- 3 files changed, 14 insertions(+), 2 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 7dbee64b..dce9bfa1 100644
---- a/meson.build
-+++ b/meson.build
-@@ -142,6 +142,12 @@ if host_is_linux
-   assert(enable_gudev, 'GUdev is not optional on Linux platforms')
- endif
- 
-+# Check for colord
-+enable_colord = get_option('colord')
-+if enable_colord
-+  colord_dep = dependency('colord', version: '>= 1.3.5')
-+endif
-+
- has_timerfd_create = cc.has_function('timerfd_create')
- config_h.set10('HAVE_TIMERFD', has_timerfd_create)
- 
-@@ -154,8 +160,8 @@ if enable_wayland
- endif
- config_h.set10('HAVE_WAYLAND', enable_wayland)
- 
--# wacom (disabled for s390/s390x and non Linux platforms)
--enable_wacom = host_is_linux_not_s390
-+# wacom
-+enable_wacom = get_option('wacom')
- if enable_wacom
-   assert(enable_gudev, 'GUDev support is required for wacom support.')
-   libwacom_dep = dependency('libwacom', version: '>= 0.7')
-diff --git a/meson_options.txt b/meson_options.txt
-index 3e04cf64..6f6eb2fc 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -4,11 +4,13 @@ option('systemd', type: 'boolean', value: true, description: 'Enable systemd int
- 
- option('alsa', type: 'boolean', value: true, description: 'build with ALSA support (not optional on Linux platforms)')
- option('gudev', type: 'boolean', value: true, description: 'build with gudev device support (not optional on Linux platforms)')
-+option('colord', type: 'boolean', value: true, description: 'build with colord support')
- option('cups', type: 'boolean', value: true, description: 'build with CUPS support')
- option('network_manager', type: 'boolean', value: true, description: 'build with NetworkManager support (not optional on Linux platforms)')
- option('rfkill', type: 'boolean', value: true, description: 'build with rfkill support (not optional on Linux platforms)')
- option('smartcard', type: 'boolean', value: true, description: 'build with smartcard support')
- option('usb-protection', type: 'boolean', value: true, description: 'build with usb-protection support')
-+option('wacom', type: 'boolean', value: true, description: 'build with Wacom devices support')
- option('wayland', type: 'boolean', value: true, description: 'build with Wayland support')
- option('wwan', type: 'boolean', value: true, description: 'build with WWAN support')
- option('colord', type: 'boolean', value: true, description: 'build with colord support')
-diff --git a/plugins/meson.build b/plugins/meson.build
-index 83e01885..20ccb26d 100644
---- a/plugins/meson.build
-+++ b/plugins/meson.build
-@@ -20,6 +20,10 @@ all_plugins = [
- 
- disabled_plugins = []
- 
-+if not enable_colord
-+    disabled_plugins += ['color']
-+endif
-+
- if not enable_smartcard
-     disabled_plugins += ['smartcard']
- endif
--- 
-2.26.2
-
diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-41.0-meson-0.61-build.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-41.0-meson-0.61-build.patch
deleted file mode 100644
index 59aa0f433ae8..000000000000
--- a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-41.0-meson-0.61-build.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/merge_requests/281.patch
-https://bugs.gentoo.org/831431
-
-From d88484002b5a0c8d2adccb2a5886a7da0a247d27 Mon Sep 17 00:00:00 2001
-From: Michal Vasilek <michal@vasilek.cz>
-Date: Fri, 14 Jan 2022 23:55:06 +0100
-Subject: [PATCH] build: remove positional i18n.merge_file arguments
-
-otherwise building with meson 0.61+ fails:
-
-    ERROR: Function does not take positional arguments.
---- a/plugins/power/meson.build
-+++ b/plugins/power/meson.build
-@@ -76,7 +76,6 @@ if host_is_linux
-   )
- 
-   i18n.merge_file(
--    policy,
-     input: policy_in,
-     output: policy,
-     po_dir: po_dir,
---- a/plugins/wacom/meson.build
-+++ b/plugins/wacom/meson.build
-@@ -7,7 +7,6 @@ policy_in = configure_file(
- )
- 
- i18n.merge_file(
--  policy,
-   input: policy_in,
-   output: policy,
-   po_dir: po_dir,
-GitLab
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-42.1.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-42.1.ebuild
index 43fc4b23d465..51c1ef9c0852 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-42.1.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-42.1.ebuild
@@ -18,7 +18,7 @@ REQUIRED_USE="
 	input_devices_wacom? ( udev )
 	wayland? ( udev )
 "
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 
 DEPEND="
 	>=sci-geosciences/geocode-glib-3.10
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-41.0.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-42.2.ebuild
index b719895dc966..0f6d9e6e2e82 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-41.0.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-42.2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+EAPI=8
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit gnome.org gnome2-utils python-any-r1 meson udev virtualx xdg
 
@@ -18,15 +18,15 @@ REQUIRED_USE="
 	input_devices_wacom? ( udev )
 	wayland? ( udev )
 "
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
 
 DEPEND="
 	>=sci-geosciences/geocode-glib-3.10
 	>=dev-libs/glib-2.58:2
 	>=gnome-base/gnome-desktop-3.37.1:3=
-	>=gnome-base/gsettings-desktop-schemas-40
+	>=gnome-base/gsettings-desktop-schemas-42
 	>=x11-libs/gtk+-3.15.3:3[X,wayland?]
-	>=dev-libs/libgweather-40:2=
+	>=dev-libs/libgweather-4.0.0:4=
 	colord? (
 		>=x11-misc/colord-1.4.5:=
 		>=media-libs/lcms-2.2:2
@@ -90,10 +90,9 @@ BDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-3.38.1-build-Make-colord-and-wacom-optional-and-controllabl.patch
+	"${FILESDIR}"/42.1-build-Make-wacom-optional-and-controllable-via-meson.patch
 	"${FILESDIR}"/${PN}-3.38.1-build-Allow-NM-optional-on-Linux.patch
 	"${FILESDIR}"/${PN}-3.38.1-Allow-udev-optional-on-Linux.patch
-	"${FILESDIR}"/${P}-meson-0.61-build.patch
 )
 
 python_check_deps() {
@@ -138,6 +137,7 @@ src_test() {
 }
 
 pkg_postinst() {
+	udev_reload
 	xdg_pkg_postinst
 	gnome2_schemas_update
 }