gentoo resync : 02.02.2022

3 files changed, 5 insertions, 153 deletions

diff --git a/gnome-extra/cinnamon-settings-daemon/Manifest b/gnome-extra/cinnamon-settings-daemon/Manifest
index 6400085ae707..f4c9ba68bd70 100644
--- a/gnome-extra/cinnamon-settings-daemon/Manifest
+++ b/gnome-extra/cinnamon-settings-daemon/Manifest
@@ -1,6 +1,5 @@
-AUX cinnamon-settings-daemon-4.8.5-build-fixes.patch 4529 BLAKE2B 9e28834a8d2d091c816a74e6bc1c50260210e726251dad5ec310f68f450ccd5ec39057c15139218b65afef6e130efc8610b897f0720043a42cdc5702758458f7 SHA512 4f9fee4ec02b11789f387405f0b75f9eabdcc72d78e109b4015fe13575967ad7610a6ad208d8ee31e5b68531e6769d2a07ddc6a9b82db71bf03d7c70920b00a8
-DIST cinnamon-settings-daemon-4.8.5.tar.gz 662123 BLAKE2B b3ddd72e55c10c2cacc6dd29145e381395bd2ef68db7082a0770bb3eb647964041ed023d4a8357f2adcf5e8c9f8f713bac837809ed5926cc0434c2dc3e5c90ad SHA512 4a1d128b3f6faf3e2c13420d3569d4fd8cfaa1798ba5cf83fcb692662b9888d22f9f4bfb6fe18af59d0632583a2730a07e3ab48cca12c357b2d318d205fd7d0a
 DIST cinnamon-settings-daemon-5.0.4.tar.gz 663647 BLAKE2B 459ca8b407291e7a84742b75a272a621d05ef1929ec76dd913af477629db862429165cec26a5985c75f81ce8eaddccc6b74cfa882106784bbfb40e015a21bab8 SHA512 861847fb238ae53fdb31c55ab7f8475f3cad9b48a5dd3611e5ea05129e16b44cc48b3ff5d38c2fdcc3669191f952bf194b6bcba80816fb4daee9e91d85b1c781
-EBUILD cinnamon-settings-daemon-4.8.5.ebuild 2348 BLAKE2B c463d0b1b7c5304f4c8a485cfa30b9dc1d50057edc9b909ba339f988d760ede512896604be52c2ad9871bd1e2cdc13b731021c7847d1201b98f6ac0b35f9352a SHA512 6fa3c7aa4b52e67eb94cab700c78c110205f846858771afdb4ef4f05b8b0452a7540f3647a99da03ee5423337909926188ebf5c2e6ae2b7968cb3b5e94c7df5d
+DIST cinnamon-settings-daemon-5.2.0.tar.gz 662588 BLAKE2B aca6aac0a7b85fa9fb60f1101e0027d5faf3f6d95f7d306ae0ad9dd2e19bb1b48ab4333bbcdff5405b52c306f67eb34bfce895b37529d3ce015182aac41dcf07 SHA512 ae076956715bc7b47746868df0f1cb4034a8ce26b2d64878c74654f08a4498155063f16bf7972316fa138f72e10a82e8589fdb607f8072bbcd92e106bedbe98e
 EBUILD cinnamon-settings-daemon-5.0.4.ebuild 2176 BLAKE2B aebb9e8a0d44b164827fc23ab77cac92040b7723c77081ae632b35fdc046092020a9801f41b8e5c1fb950d1ed2b2e7ea694f42f93baf956cab0ac8122cce8cee SHA512 cb7656f25108c5c239c961eb1618ad88f8e38193b4f23a9653dd7328eec9f50183f1b37e4b46bc9e8d8409ee2b5027cd064033a915443e8251c331554cdf6927
+EBUILD cinnamon-settings-daemon-5.2.0.ebuild 2153 BLAKE2B 8282b1cf60108efb8f0954c4114970648f14122d29113a1172f93ebfeb214b15a1ce3c58393ea0914f6345e43aea510c2802882fc885900d94b6b3b2ef9426e9 SHA512 73ad996d9310281e7ece8a7dc3dddf333a88a1daf9ad31de1413b40dae46248424429e17ed9d475bed7aa3f673553c29eea1d671a6d454bb81146bc88a5e5396
 MISC metadata.xml 504 BLAKE2B 99901d6f11af1367053f408c6fc1dffafa3903dc04b9a38faed0b3261e578c33fad49948ce09ecfb6d277472a3f9c3d088a32231b02236677071413dc3d4917e SHA512 f5afa4c1e73b6765aee16c5762b3145223bf4c56cae60b7e65ef503aec0f684276de2a7a22b0b866996cd96376cfc69e36e395ad3da9e7ce593732cb075fd64c
diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-4.8.5.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-5.2.0.ebuild
index f28af6802a1c..b4238e71f45e 100644
--- a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-4.8.5.ebuild
+++ b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-5.2.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9,10} )
 
 inherit meson gnome2-utils python-any-r1 xdg
 
@@ -13,14 +13,14 @@ SRC_URI="https://github.com/linuxmint/cinnamon-settings-daemon/archive/${PV}.tar
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE="+colord cups input_devices_wacom smartcard systemd"
 
 RDEPEND="
 	>=dev-libs/glib-2.40.0:2
 	dev-libs/libgudev:=
 	>=gnome-base/libgnomekbd-3.6
-	>=gnome-extra/cinnamon-desktop-4.8:0=
+	>=gnome-extra/cinnamon-desktop-5.2:0=
 	media-libs/fontconfig
 	>=media-libs/lcms-2.2:2
 	media-libs/libcanberra:0=[gtk3,pulseaudio]
@@ -61,16 +61,9 @@ BDEPEND="
 	${PYTHON_DEPS}
 	dev-util/glib-utils
 	dev-util/gdbus-codegen
-	>=dev-util/intltool-0.37.1
 	virtual/pkgconfig
 "
 
-PATCHES=(
-	# Miscellaneous meson configuration/compilation fixes
-	# https://github.com/linuxmint/cinnamon-settings-daemon/pull/314
-	"${FILESDIR}/${PN}-4.8.5-build-fixes.patch"
-)
-
 src_prepare() {
 	default
 	python_fix_shebang install-scripts
diff --git a/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-4.8.5-build-fixes.patch b/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-4.8.5-build-fixes.patch
deleted file mode 100644
index f70d1e544e94..000000000000
--- a/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-4.8.5-build-fixes.patch
+++ /dev/null
@@ -1,140 +0,0 @@
-From 281bc6b8e0085a91b7e59af45469c4da397646c2 Mon Sep 17 00:00:00 2001
-From: Sparky Bluefang <sparky@bluefang-logic.com>
-Date: Mon, 28 Dec 2020 17:05:21 -0500
-Subject: [PATCH] build: Add missing defines. Fix optional wacom build. Make
- build options behave consistently.
-
----
- meson.build                | 20 ++++++++++++--------
- meson_options.txt          | 14 ++++++++++----
- plugins/meson.build        |  2 +-
- plugins/xrandr/meson.build |  1 +
- 4 files changed, 24 insertions(+), 13 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 0e11d50..0d6c35a 100644
---- a/meson.build
-+++ b/meson.build
-@@ -9,6 +9,7 @@ pkgname = meson.project_name().to_lower()
- api_version = '3.0'
- 
- cc = meson.get_compiler('c')
-+cargs = []
- 
- # directories
- prefix = get_option('prefix')
-@@ -43,7 +44,7 @@ endif
- cinnamon_desktop_required = '>= 4.8.0'
- canberra = dependency('libcanberra-gtk3')
- cinnamon_desktop = dependency('cinnamon-desktop', version: cinnamon_desktop_required)
--colord = dependency('colord', version: '>= 0.1.27')
-+colord = dependency('colord', version: '>= 0.1.27', required: get_option('use_color'))
- cups = dependency('cups', version: '>= 1.4', required: get_option('use_cups'))
- cvc = dependency('cvc', version: cinnamon_desktop_required)
- fontconfig = dependency('fontconfig')
-@@ -56,13 +57,13 @@ gtk = dependency('gtk+-3.0', version: '>= 3.14.0')
- gudev = dependency('gudev-1.0', required: get_option('use_gudev'))
- libnotify = dependency('libnotify', version: '>= 0.7.3')
- kbproto = dependency('kbproto')
--nss = dependency('nss', version: '>= 3.11.2', required: get_option('enable_smartcard'))
-+nss = dependency('nss', version: '>= 3.11.2', required: get_option('use_smartcard'))
- polkit = dependency('polkit-gobject-1', version: '>= 0.97', required: get_option('use_polkit'))
- pulse_required = '>= 0.9.16'
- pulse = dependency('libpulse', version: pulse_required)
- pulse_glib = dependency('libpulse-mainloop-glib', version: pulse_required)
- upower_glib = dependency('upower-glib', version: '>= 0.9.11')
--wacom = dependency('libwacom', version: '>= 0.7', required: false)
-+wacom = dependency('libwacom', version: '>= 0.7', required: get_option('use_wacom'))
- x11 = dependency('x11')
- xext = dependency('xext')
- xfixes = dependency('xfixes')
-@@ -80,13 +81,12 @@ librsvg = dependency('librsvg-2.0', version: '>= 2.36.2', required: wacom.found(
- xorg_wacom = dependency('xorg-wacom', required: wacom.found())
- 
- lcms = dependency('lcms2', version: '>= 2.2', required: false)
--has_new_lcms = lcms.found()
--if not has_new_lcms
--    lcms = dependency('lcms2')
-+if lcms.found()
-+    cargs += '-DHAVE_NEW_LCMS'
-+else
-+    lcms = dependency('lcms2', required: colord.found())
- endif
- 
--cargs = []
--
- using_logind = false
- if not get_option('use_logind').disabled()
-     logind = dependency('libsystemd-logind', required: false)
-@@ -125,6 +125,10 @@ if gudev.found()
-     cargs += '-DHAVE_GUDEV'
- endif
- 
-+if wacom.found()
-+    cargs += '-DHAVE_WACOM'
-+endif
-+
- if not get_option('enable_debug')
-     cargs += [
-           '-Wno-deprecated-declarations',
-diff --git a/meson_options.txt b/meson_options.txt
-index 0a6941b..e3c89f3 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -35,20 +35,26 @@ option(
-     description: 'Whether cups (and therefore the print notifications plugin) support should be enabled'
- )
- option(
--    'enable_smartcard',
-+    'use_smartcard',
-     type: 'feature',
-     value: 'enabled',
-     description: 'Set to false to disable smartcard support'
- )
- option(
-     'use_color',
--    type: 'boolean',
--    value: true,
-+    type: 'feature',
-+    value: 'enabled',
-     description: 'Whether the color plugin should be enabled'
- )
-+option(
-+    'use_wacom',
-+    type: 'feature',
-+    value: 'auto',
-+    description: 'Whether the wacom plugin should be enabled'
-+)
- option(
-     'enable_debug',
-     type: 'boolean',
-     value: false,
-     description: 'Show additional build warnings'
--)
-\ No newline at end of file
-+)
-diff --git a/plugins/meson.build b/plugins/meson.build
-index 0d11a52..069366d 100644
---- a/plugins/meson.build
-+++ b/plugins/meson.build
-@@ -24,7 +24,7 @@ subdir('sound')
- subdir('xrandr')
- subdir('xsettings')
- 
--if get_option('use_color')
-+if colord.found()
-     subdir('color')
- endif
- 
-diff --git a/plugins/xrandr/meson.build b/plugins/xrandr/meson.build
-index db2bf73..3296f1a 100644
---- a/plugins/xrandr/meson.build
-+++ b/plugins/xrandr/meson.build
-@@ -11,6 +11,7 @@ xrandr_deps = [
-     csd_dep,
-     libnotify,
-     upower_glib,
-+    wacom,
-     xfixes,
- ]
-