gentoo auto-resync : 13:03:2025 - 00:28:24edge

10 files changed, 23 insertions, 18 deletions

diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index 260fa2454c93..144b99859df9 100644
--- a/gnome-extra/Manifest.gz
+++ b/gnome-extra/Manifest.gz
diff --git a/gnome-extra/cinnamon-desktop/Manifest b/gnome-extra/cinnamon-desktop/Manifest
index bde0075a6ec6..a867b46e3144 100644
--- a/gnome-extra/cinnamon-desktop/Manifest
+++ b/gnome-extra/cinnamon-desktop/Manifest
@@ -1,6 +1,6 @@
 AUX cinnamon-desktop-6.4.0-remove-pnp_ids-option.patch 16244 BLAKE2B 4ff77ac0adfa5d887caec2409dde56750e60f8ef69fa41050da1d4b7ca7b7a16cb705008c187bb1f8012dda82f613cba52e26be17e71350f265bc2935a6400e3 SHA512 ba9c791829df8a6d01d6db42e3a58b57689ab42ad7f69160ff3d383f632569558027cf54ea5ee67063ad82f376dbffc4b17514ab9ac64f87fd4d551780d0c103
 DIST cinnamon-desktop-6.2.0.tar.gz 510369 BLAKE2B e91cc5de64cfa2b936dd224727a493f7ca9049272d7cead88f6e6682b3e11505798d340e245816386e8427712dc3159c416bc51ac6b8cdf937649f34afa247f7 SHA512 be7e4fe206fb4fa62cacf7190b5702035313346ae51a3ef985ec2046d30e0ae5b1e1d314f82d362a363c3949deab02e4d2a4ea910ffe7f279111563c224f75f7
 DIST cinnamon-desktop-6.4.1.tar.gz 509746 BLAKE2B 36cc34af24adeaa80bb89440bfbb0676131493c55a418d55397e0d14beff1afecf1c0073b653b5927d830ae16200575489608d9f33c9c8603cdc328890c04a0a SHA512 4089e2261426019b922005480e4d106e2cc6dbba2d28044cefaf7e861597446b484605bf18b7cf114c323a78afe83fb56fe4fceab8b8a986b39a67132ac4b4a5
-EBUILD cinnamon-desktop-6.2.0.ebuild 1714 BLAKE2B 181ec00176e0f12f4335b401a7fc364f7260d2a8cb81c0294d0ef7c8e42b1250add6451d1374d2582e722b336a621ff7fd27ff8d0560d99136b74dc9e0ea88bb SHA512 9fbee55110211224626ff0cda9a63fd22762d4d5d9ba6429e8b6132f2e5141588b485b3ded3b3c9c3b5249ba09dda4c0f008887bacf55ae863811d38c1c0bfe9
-EBUILD cinnamon-desktop-6.4.1.ebuild 1885 BLAKE2B fd251a80904d71a56500bb100854a5ecc27ea00b609c4f26f8aeb28f8a150d2f51c76df7b9574502d200f7ec35a9a47def39c0ab43726b581846600acede218e SHA512 e924e8080f9f94f663f83980ac6cd016a9c646b71c18186efca330bff00b8b732ee4eed2e57ad019a58155bab040a3d4c2ddff8ab7e31741b7fae3b0d9c6dc25
+EBUILD cinnamon-desktop-6.2.0-r1.ebuild 1716 BLAKE2B 17ea5735a895efe6eb031e47cf80f3157224ec2d535d32f03f31b311c915241341682f431bdf9dd4aa61ff69abeb5d9077d4eb35f7455da735b3240836e02310 SHA512 24b3bd894aa9f0493888f860eb1b1607bb6bf6f85e2690ab7b2483705416f71a78dac686d9ba93da5c6b02e9b5bac2c0fc230c07018cbfe4f1c306806dcce0ae
+EBUILD cinnamon-desktop-6.4.1-r1.ebuild 2079 BLAKE2B b9784cbda4fc5294539bcce86e455376916703f4936e00be8240cea05d5966fecbcc2c5d371b3a7596c621427398b844e1350dfabf673141c7e2c42c34f5148a SHA512 87effd276aa6c167506ee7c31588bc2f80da085fa5ea1440075fd322d52c8bbd8b47e842c607d050fa76ee9d92599e8eaf9354da02c7e19dd1ed862b09167f60
 MISC metadata.xml 496 BLAKE2B c019ef51b10de9ccafed1294e6d436dcdc8f02735170afe9e038689c6c4d76fb3e099bc9ec7f10c2a50d2bfa5e1d1c191667a470d734effad53d9d299f431664 SHA512 41a99dd4e1aad85dda44e2168bc150e2c27bb40a45c0dfe0f085e502242e6a0704ad8b47f64140d81afa7ff096cac735c46827f3d949962400de92d769505cc4
diff --git a/gnome-extra/cinnamon-desktop/cinnamon-desktop-6.2.0.ebuild b/gnome-extra/cinnamon-desktop/cinnamon-desktop-6.2.0-r1.ebuild
index 975d5f73aba2..3e5eb39cf4d8 100644
--- a/gnome-extra/cinnamon-desktop/cinnamon-desktop-6.2.0.ebuild
+++ b/gnome-extra/cinnamon-desktop/cinnamon-desktop-6.2.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -24,7 +24,7 @@ RDEPEND="
 	sys-apps/hwdata
 	x11-libs/cairo[X]
 	>=x11-libs/gdk-pixbuf-2.22:2[introspection]
-	>=x11-libs/gtk+-3.3.16:3[introspection]
+	>=x11-libs/gtk+-3.3.16:3[introspection,X]
 	x11-libs/libX11
 	>=x11-libs/libXext-1.1
 	x11-libs/libxkbfile
diff --git a/gnome-extra/cinnamon-desktop/cinnamon-desktop-6.4.1.ebuild b/gnome-extra/cinnamon-desktop/cinnamon-desktop-6.4.1-r1.ebuild
index 2849983c8bc1..a7ca019663f0 100644
--- a/gnome-extra/cinnamon-desktop/cinnamon-desktop-6.4.1.ebuild
+++ b/gnome-extra/cinnamon-desktop/cinnamon-desktop-6.4.1-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 PYTHON_COMPAT=( python3_{10..13} )
 
-inherit meson gnome2-utils python-any-r1
+inherit meson flag-o-matic gnome2-utils python-any-r1
 
 DESCRIPTION="A collection of libraries and utilites used by Cinnamon"
 HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon-desktop"
@@ -14,6 +14,7 @@ SRC_URI="https://github.com/linuxmint/cinnamon-desktop/archive/${PV}.tar.gz -> $
 LICENSE="GPL-1 GPL-2+ LGPL-2+ LGPL-2.1+ MIT"
 SLOT="0/4" # subslot = libcinnamon-desktop soname version
 KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="wayland"
 
 RDEPEND="
 	app-text/iso-codes
@@ -25,7 +26,7 @@ RDEPEND="
 	virtual/libudev:=
 	x11-libs/cairo[X]
 	>=x11-libs/gdk-pixbuf-2.22:2[introspection]
-	>=x11-libs/gtk+-3.3.16:3[introspection]
+	>=x11-libs/gtk+-3.3.16:3[introspection,wayland?,X]
 	x11-libs/libX11
 	>=x11-libs/libXext-1.1
 	x11-libs/libxkbfile
@@ -56,6 +57,10 @@ src_prepare() {
 }
 
 src_configure() {
+	# defang automagic dependencies
+	# Preliminary wayland support only. Xorg code is unconditional.
+	use wayland || append-cflags -DGENTOO_GTK_HIDE_WAYLAND
+
 	local emesonargs=(
 		# https://github.com/linuxmint/cinnamon-desktop/commit/7eadfb1da9a42384396978b8ab46e0725d18e04f
 		# > Unless/until this fixes an actual identified issue for us or provides significant advantages
diff --git a/gnome-extra/cinnamon-screensaver/Manifest b/gnome-extra/cinnamon-screensaver/Manifest
index 3f8aadf8ce5e..0ce7eee512a6 100644
--- a/gnome-extra/cinnamon-screensaver/Manifest
+++ b/gnome-extra/cinnamon-screensaver/Manifest
@@ -1,5 +1,5 @@
 DIST cinnamon-screensaver-6.2.1.tar.gz 161088 BLAKE2B 86159f06e44bd58ca443457109c1345ba3021d1b8aa339d315da45fad994e8fccf59fffdc8bef3edefebf42a6ea4ab632354ef5a8f7c10f6d4d70ab517fce3bb SHA512 4033d1170b4ef359dc8a6d529b40e40fa5bb630f4900eaf5d45c73d7caadde00345811bc5b8f347bfc184f16abbdb232ebf71bb911c713bb00ced557115fd300
 DIST cinnamon-screensaver-6.4.0.tar.gz 160693 BLAKE2B 47e66d2d68ae10edb6b25bdd94624d7df02cb328f60eb390ced9ca31990993bea0c50af4b878ffcbc0b138d65949a0461403b8718bee29021f62f052c55049fd SHA512 286497a70b3b77f5b0f392554b7283487fee84fc3b449510232302351500f9312d6f308d3bd19d85b5f047d250aa7368413193a864e4a4ebed285ab13ad0ca4c
-EBUILD cinnamon-screensaver-6.2.1.ebuild 1692 BLAKE2B b6ca63ad8ae70bb320ed7faaad3f6840d6fbbedcfe726145ba87f69f2776696fabea0313648f093f13203be02fd69b36ffd4827f6b3cb7a3d32623c22b00d67d SHA512 1bc0c12826cf1fcc57628338a85c0108a1fbeeee74e281aafb6e4cde5d29fa80f728d018129200fdcf44521f2c2958fce3dbf09fac04653c967ad69997ff92af
-EBUILD cinnamon-screensaver-6.4.0.ebuild 1694 BLAKE2B 151ad623b4188d76c6d65c86744fe772f0b032c0dbc2d49571f32f06578079635ad56ff6510d3ce910c0a87177ffec62f1c7783bdcc3d2e8695ec09026deb38c SHA512 4cb2ec2762199409d74a69aafdd4150883bd1495c33add6e40e892d23c60f72a385ec6e0c5aadc4f34dd3a288eecfb9cc32743f331549fcf080c0b387d4deda1
+EBUILD cinnamon-screensaver-6.2.1-r1.ebuild 1694 BLAKE2B 6309d3e941825ec5d5bc837d93470ea3295b5180ddd74c75c0e8664339e29ff046233d11766ed34053900c82d9ba630d58ba2dd965b5003d4f58d54f28830fe0 SHA512 122f2c3c32798f2179d06b52fa8aac4fc9c60f00fbf5c5f479d8a49d9100a11552501b2e41fddd9edd320b445b41ab3cd8c4a39ad09e1a4ea8be5c011e723e58
+EBUILD cinnamon-screensaver-6.4.0-r1.ebuild 1696 BLAKE2B 33028a4c44bab6f090c762672e47c7dc682780e6742a792d2fbe795c223826e3db0e0c0f5a6b9b4216afe4dbb5735d47813cc1cc24003739ad873985927f2ac5 SHA512 59ff265699da6c5b14486b1e51ea6ed91e25f06dc5302692a633ed2eb9bbdec51df7e01a1406eaf3c5d712965f81b242e411b719e9efc5fbd314eefd5d1654e2
 MISC metadata.xml 500 BLAKE2B 92b85c1d68491b0e4f88203070760f1e8d2b51b3bf9d3615e18a26cdaf6466eadaa700f18f1668a9b214a540fe01639a49a8535cd43435ddba192fef0267ce98 SHA512 35fc95aac49117f0bd643ccd17d2e461ad1cc5dc744256f6cf83f4248c087b33f66eb4352aeae8105983789e7f8ca74727fc48557f462edfba658d411bb536f7
diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-6.2.1.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-6.2.1-r1.ebuild
index f682112a76be..2bb8d5c99d22 100644
--- a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-6.2.1.ebuild
+++ b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-6.2.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -22,7 +22,7 @@ COMMON_DEPEND="
 	>=dev-libs/glib-2.37.3:2[dbus]
 	>=gnome-extra/cinnamon-desktop-6.2
 	sys-libs/pam
-	>=x11-libs/gtk+-3.22:3[introspection]
+	>=x11-libs/gtk+-3.22:3[introspection,X]
 	x11-libs/cairo
 	x11-libs/libX11
 	x11-libs/libXext
diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-6.4.0.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-6.4.0-r1.ebuild
index 56f9cceb5fa3..86bb9c77d699 100644
--- a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-6.4.0.ebuild
+++ b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-6.4.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -22,7 +22,7 @@ COMMON_DEPEND="
 	>=dev-libs/glib-2.37.3:2[dbus]
 	>=gnome-extra/cinnamon-desktop-6.4
 	sys-libs/pam
-	>=x11-libs/gtk+-3.22:3[introspection]
+	>=x11-libs/gtk+-3.22:3[introspection,X]
 	x11-libs/cairo
 	x11-libs/libX11
 	x11-libs/libXext
diff --git a/gnome-extra/cinnamon-session/Manifest b/gnome-extra/cinnamon-session/Manifest
index 3b45ff701173..8fa9dd8f078c 100644
--- a/gnome-extra/cinnamon-session/Manifest
+++ b/gnome-extra/cinnamon-session/Manifest
@@ -1,5 +1,5 @@
 DIST cinnamon-session-6.2.1.tar.gz 166106 BLAKE2B ef7bb345f6c32f5402d9ff5dca152455a861e41e4fc5a77d1184f75ef17b70ab78bd3cfc9f63265703153d86217b5cd0a679f50add722110c47f7246050ca68f SHA512 bc0e69b938920149c26e2470aab9c2290b3b7ecea8a6e8249683402eb07af0c3a88c42cb86723d422dd14442246e841469010a05e808e675ff0e7ff1cc834224
 DIST cinnamon-session-6.4.0.tar.gz 165993 BLAKE2B 13bed1e5cec912f679c13c9ef8e4bbca8c267c37663910ba0a82e78074c77405c259020dffb86c843f2e080792e836a567d120eb5c80459e870a29a959f7f4a3 SHA512 6ad1238a133ed07716807bdcd9599321fe8e27b3de849e7323dab09b79c71a2414f926be2e5dc2584da38bd47e921b3ad2391193c6c241af32524fca68d270b4
-EBUILD cinnamon-session-6.2.1.ebuild 1674 BLAKE2B b5a63b87f44792b51d70f0496a6a3b3fcdecc22c46aea8ba185c30617b7d4489e159e8c8c7396e333e2ca3a5cf543aeaf481b334a11711e1e6a575cc81155aa1 SHA512 eae64d41ab69b5ad99e9046b787afb775948cb1ab1d06d7ddb7b05155d6c66afa01f1c023ffaf2b1b7823a78efc2723e58c2453842e740d5ea5cfe6f0ff02f0f
-EBUILD cinnamon-session-6.4.0.ebuild 1676 BLAKE2B 2141bad05aaed8685a844ad77a5c5d329d8ce80b805817ce5a87c018165facd3e0a232dd35f99b939583e6934eaee4e16542d3b6b89e875f6a3b72e86790c0dc SHA512 278524529d19c3612b8f95706754e10077091fd6349538beed7fd0c73710e5d40e49a966a7d545a16e994161c6d99d7bc0984cf4261875aca726502f9ce799bc
+EBUILD cinnamon-session-6.2.1-r1.ebuild 1676 BLAKE2B e3eb7cfec08fe4757ac274d17259d880f918f8dfd4c6675c00baa853167882e04270018044f807369eb62b7c27e0c9d0a9fe36cbc541f90fd58aba561722adcb SHA512 5a6b9413bdc8efb432381005b57892d429d083adb9c7b368659a68b21189c71b5e1eeb9997c296c27da19cc7adae60c7f45342d142e00954128b4ff678f1f4c8
+EBUILD cinnamon-session-6.4.0-r1.ebuild 1678 BLAKE2B b9d052672fd8c54a21517cfd3e1135b27773e48557eec3f3a69363b1b5420b9c5a6993cb2d68797da2a7a5769112ea6afbb010e6388239cd16482ca089ee9ef4 SHA512 d2cbaa2c2bebc39f94e962d22ffac0442a2ffb4daef1a6c9f71b4d5cc09d4c21684cf73be4cbe0cc4c39eafc47702112ca24ba5c4d28e8fdf3fd76554fe0f3ab
 MISC metadata.xml 496 BLAKE2B 3b3170a447d7818cdd93b3183feee36751832a07da741b16dfdfe029e09733f3ba94815312e6444b3421dd7bc3df9b4ca2f1c1ac2a5d83ae3881b1ab7cf809c0 SHA512 65d223bf44f83d8d2bda72791b362c4302ec813e9090331cf5ddc97e10ed610c1a91c6d467ff72d7e1430e7d70dcfa09f9c8e35c50a86130236798c80e19a2f2
diff --git a/gnome-extra/cinnamon-session/cinnamon-session-6.2.1.ebuild b/gnome-extra/cinnamon-session/cinnamon-session-6.2.1-r1.ebuild
index e83d54d266a3..4e71251b1253 100644
--- a/gnome-extra/cinnamon-session/cinnamon-session-6.2.1.ebuild
+++ b/gnome-extra/cinnamon-session/cinnamon-session-6.2.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -24,7 +24,7 @@ COMMON_DEPEND="
 	virtual/opengl
 	x11-libs/cairo
 	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3:3[introspection]
+	>=x11-libs/gtk+-3:3[introspection,X]
 	x11-libs/libICE
 	x11-libs/libSM
 	x11-libs/libX11
diff --git a/gnome-extra/cinnamon-session/cinnamon-session-6.4.0.ebuild b/gnome-extra/cinnamon-session/cinnamon-session-6.4.0-r1.ebuild
index c22e79716a91..f96a4fad76f9 100644
--- a/gnome-extra/cinnamon-session/cinnamon-session-6.4.0.ebuild
+++ b/gnome-extra/cinnamon-session/cinnamon-session-6.4.0-r1.ebuild
@@ -24,7 +24,7 @@ COMMON_DEPEND="
 	virtual/opengl
 	x11-libs/cairo
 	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3:3[introspection]
+	>=x11-libs/gtk+-3:3[introspection,X]
 	x11-libs/libICE
 	x11-libs/libSM
 	x11-libs/libX11