gentoo auto-resync : 23:08:2024 - 14:56:14

2 files changed, 14 insertions, 4 deletions

diff --git a/gnome-extra/cinnamon-settings-daemon/Manifest b/gnome-extra/cinnamon-settings-daemon/Manifest
index 9413dd777073..08114d96c99f 100644
--- a/gnome-extra/cinnamon-settings-daemon/Manifest
+++ b/gnome-extra/cinnamon-settings-daemon/Manifest
@@ -2,5 +2,5 @@ AUX cinnamon-settings-daemon-6.0.0-c99.patch 1002 BLAKE2B b816574312cbb0d9e9cf05
 DIST cinnamon-settings-daemon-6.0.0.tar.gz 578061 BLAKE2B f05e14e9d3c15bc94df5435b0f317e1924993fbf4908491ea5a825b623c6a6f127ce20f5c31f54bfbd547a70ad645c3dbe71d9c55f790a3e0730d55bc58d6316 SHA512 44348765bf8c0cb941d177a6765aef10796d72f5c215dbffa4b514523956e257128d6bbbb0dcd9c3f0b2bcde24745e082ad82a7cee149125903e13b349c07200
 DIST cinnamon-settings-daemon-6.2.0.tar.gz 578907 BLAKE2B 24b9591f5e6bbacd92f564bfb4f1960c14bca78194dd00746ff4b31f2a6b99d09a701ca939aa39b932141c7c13d998b1a061185bd7b751815dbd8b43d1fceec2 SHA512 c2102ace141448694a4d22331f1b039ccdca41988165f0e1af4446c527be89f8ae2f87e0555a0cf4fa5bbb31e5c866f0c9c7a52174a1664183695695b5eed7be
 EBUILD cinnamon-settings-daemon-6.0.0-r1.ebuild 2229 BLAKE2B ec05143d040ef79e6b810176ddf0cde3d9bac06b32f5b15e294245f0811011b393b84b2eac7025d327cb61e23bc8f7d7b34f7d781f2ef9e302ca69deafdea274 SHA512 e9ae2f233ec549628ca31ac9d6a30c20793908825cbf027e3e79ff325c4b2bf68cca94033a619d68cc3493dae00a81d81293bc4eb3f9f8da4c2364f76e0ac498
-EBUILD cinnamon-settings-daemon-6.2.0.ebuild 2181 BLAKE2B 386cd671fb5c60a0857a39c51d0b86d1d673fd47e79cd7ca086a222f3b92178068aae76fdbbbed4bc499afa98b05b8a2151bda1a76fe94d0786a659776e703f3 SHA512 f8d346083adc87645e9d5f76ec3f4f794d858792c456008759b420eb0271b047c3f8261ef19aa662377c83ea0b25fc0e2dde0626b625fc7f8a5f0b601e1d4dab
+EBUILD cinnamon-settings-daemon-6.2.0-r1.ebuild 2452 BLAKE2B c1e0b447c0158997c612e7221dbe0ebbee39c90bb81abe0f74aadb9841be99aca62fd921faaa90cfc4ce31971830ea7197bfc92c78d3a84e8a8c535cd0462cf2 SHA512 18583e59b3f2d06014b4f3aa3683234aa2eef27e4afa5407c588c2b1f75ca9c5793e239425519b014cfea763e03d2c75955ca90399e6de444bf232d08bd3767c
 MISC metadata.xml 504 BLAKE2B 99901d6f11af1367053f408c6fc1dffafa3903dc04b9a38faed0b3261e578c33fad49948ce09ecfb6d277472a3f9c3d088a32231b02236677071413dc3d4917e SHA512 f5afa4c1e73b6765aee16c5762b3145223bf4c56cae60b7e65ef503aec0f684276de2a7a22b0b866996cd96376cfc69e36e395ad3da9e7ce593732cb075fd64c
diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-6.2.0.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-6.2.0-r1.ebuild
index bf665356ce46..701215fbc2c5 100644
--- a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-6.2.0.ebuild
+++ b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-6.2.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{10..13} )
 
-inherit meson gnome2-utils python-any-r1 xdg
+inherit meson flag-o-matic gnome2-utils python-any-r1 xdg
 
 DESCRIPTION="Cinnamon's settings daemon"
 HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon-settings-daemon"
@@ -28,7 +28,6 @@ RDEPEND="
 	>=sys-auth/polkit-0.97
 	x11-libs/cairo
 	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.14.0:3[wayland=]
 	>=x11-libs/libnotify-0.7.3
 	x11-libs/libX11
 	x11-libs/libXext
@@ -44,8 +43,13 @@ RDEPEND="
 		app-admin/system-config-printer
 		net-print/cups-pk-helper )
 	input_devices_wacom? (
+		>=x11-libs/gtk+-3.24.41-r1:3[wayland?,X]
 		>=dev-libs/libwacom-0.7:=
-		>=gnome-base/librsvg-2.36.2 )
+		>=gnome-base/librsvg-2.36.2
+	)
+	!input_devices_wacom? (
+		>=x11-libs/gtk+-3.14.0:3
+	)
 	smartcard? (
 		dev-libs/nspr
 		>=dev-libs/nss-3.11.2
@@ -71,6 +75,12 @@ src_prepare() {
 }
 
 src_configure() {
+	# The only component that uses gdk backends is the wacom plugin
+	if use input_devices_wacom; then
+		# defang automagic dependencies
+		use wayland || append-cflags -DGENTOO_GTK_HIDE_WAYLAND
+	fi
+
 	# gudev not optional on Linux platforms
 	local emesonargs=(
 		-Duse_gudev=enabled