gentoo auto-resync : 15:02:2024 - 23:36:26

28 files changed, 498 insertions, 105 deletions

diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index cd702d9ab2e0..d1d01cbbff79 100644
--- a/gnome-extra/Manifest.gz
+++ b/gnome-extra/Manifest.gz
diff --git a/gnome-extra/cinnamon-control-center/Manifest b/gnome-extra/cinnamon-control-center/Manifest
index a68b17a70a6f..436b34ca966d 100644
--- a/gnome-extra/cinnamon-control-center/Manifest
+++ b/gnome-extra/cinnamon-control-center/Manifest
@@ -1,5 +1,6 @@
-DIST cinnamon-control-center-5.6.1.tar.gz 3874429 BLAKE2B 53344aead6c5e31eeadf70e26a2ae61db930e595b5e546ac08b57029c924e4105d126fe6a27cd3ef7d4a59b51f83e0790dfaf815d9a3addfa5c496eab82d4537 SHA512 8679cc3afab77605b5e949e58cacb55782fca0ebc41991de7421b12fcd6c85991b6e4f5c70611753724ff47ea4eb39339ea4cea29e3f4e3399d9141fe4c80c7f
+AUX cinnamon-control-center-6.0.0-fix-optional-wayland.patch 1702 BLAKE2B 442a793bc3574a2fea9ea1f4b3cdbaa1fd78a74baec80b6ff6d2d35e0ca0e3c7eb4981490347e645e7fa4cabffdaecd5faa0076d31df6cfd3fac51ba42d20c73 SHA512 eb4395fa7e8a5822ea62068ddde0eb118d747dbbe54228fa015dc97ca6d8f041ab64095a1bc42114d82d775fc1bf569708b8e027034a95aa2ab01e99993fe552
 DIST cinnamon-control-center-5.8.2.tar.gz 3820570 BLAKE2B 3bc009e696c7d469b2a2e15aecc62f290e26d08f65400418666e4a5564a3a113107996326e1edec93a45e9cb935ea96946e385376fe7f1b4b1185425bb4d4964 SHA512 b7b726659ca712a81c8b52bf514c8f061f5146a4728a3f2172ac5658b947e3e72c3194513ac815efaa727664e03ce2684d8d491bfcf0f6e91ea4566d832e86a2
-EBUILD cinnamon-control-center-5.6.1.ebuild 2483 BLAKE2B a93ac698fbb133ee2bc628f17e16da5234bd21d1ef2373cde2500bfddc544f25f071d21175769b951ed284d6591285267d521818ce686084328f83c883c0bd1c SHA512 21457bf328ce099130bb82e53e491e8c98291e6463f6b4ab90c96855926f19a2faedc61e9bfe13fd3ebaeca9da137ab4aaa70d2f5470d51fb1605f6ff16f9ba6
+DIST cinnamon-control-center-6.0.0.tar.gz 3821056 BLAKE2B b856e4c258a76aa5e558cca53ac333df81ae135d731a5de65470282e741a95f2c179fbd9f28e8bb26824de5ee1f9b9fcb0143fee1760800149a345085c45f11b SHA512 e49b72590418da63c6db9c4224e6a32f9014bf4a4810e3a89babaa21d211ade135912e7be1a356c57328d85774517e0f696c724e62b2d3581c5f73c8a88cf486
 EBUILD cinnamon-control-center-5.8.2.ebuild 2494 BLAKE2B de7eabdb9d42d73e73c69e2715a566d92038402247792843fff208f90c19d49a35b452ef9de5cd5c89662c1a9113e3fcb0081a713616a47161542a03f0ea1203 SHA512 084d0922ddebbe5a9335af3f535ead6da15f8d4aeda50ca0733b9fffce2e57746af0c2144de72cbab8a8f18ba646220840617ea26292e6a72d3bcd9b201a7ad7
+EBUILD cinnamon-control-center-6.0.0.ebuild 2691 BLAKE2B 63a2dbe84c3ae8fc0f817e966a57517bceb29ef829eb425f89aa177baf2aad051ce39f236ec39355bd1714709290b229db73b7414560db8d110ea78187457fd1 SHA512 a0c54d3286b3f0d7c36b43df074ae340921546b236dabf4cdb0814a0656462a1e652a7415d49b11553f4d98f9208462b5a466c44a15668917268818799bb1c78
 MISC metadata.xml 762 BLAKE2B 5a4411060287e76154bd0727feae76a45e8992077d7cbc6d1ad102d933246d98b3349bf0dc516f35d538e6c1d4a5d427e1561b646b628d408a5743666f5f2ca7 SHA512 c03709d9a1c8d678ce0957d08516e49f8affa6be2153f30607c0f1be7c29a1e00f4955f2112e82dc7c3b3e410a6dabf5ba2bdd9f3141b6a5299068598decd0c3
diff --git a/gnome-extra/cinnamon-control-center/cinnamon-control-center-5.6.1.ebuild b/gnome-extra/cinnamon-control-center/cinnamon-control-center-6.0.0.ebuild
index 535e5122bcc3..c6374005882f 100644
--- a/gnome-extra/cinnamon-control-center/cinnamon-control-center-5.6.1.ebuild
+++ b/gnome-extra/cinnamon-control-center/cinnamon-control-center-6.0.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit meson gnome2-utils python-any-r1 xdg virtualx
 
@@ -13,22 +13,22 @@ SRC_URI="https://github.com/linuxmint/cinnamon-control-center/archive/${PV}.tar.
 
 LICENSE="GPL-2+ LGPL-2+ LGPL-2.1+ MIT"
 SLOT="0"
-IUSE="+colord input_devices_wacom +networkmanager +modemmanager gnome-online-accounts systemd test"
+IUSE="+colord input_devices_wacom +networkmanager +modemmanager gnome-online-accounts systemd test wayland"
 REQUIRED_USE="modemmanager? ( networkmanager )"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
 RESTRICT="test"
 
 COMMON_DEPEND="
 	app-accessibility/at-spi2-core:2
 	>=dev-libs/glib-2.44.0:2
 	>=gnome-base/libgnomekbd-3.0.0:0=
-	>=gnome-extra/cinnamon-desktop-5.6:0=
-	>=gnome-extra/cinnamon-menus-5.6
+	>=gnome-extra/cinnamon-desktop-6.0:0=
+	>=gnome-extra/cinnamon-menus-6.0
 	media-libs/fontconfig
 	>=sys-auth/polkit-0.103
 	>=sys-power/upower-0.99.8:=
 	>=x11-libs/gdk-pixbuf-2.23.0:2
-	>=x11-libs/gtk+-3.16.0:3
+	>=x11-libs/gtk+-3.16.0:3[wayland=]
 	>=dev-libs/libgudev-232
 	>=x11-libs/libnotify-0.7.3
 	x11-libs/cairo
@@ -36,29 +36,42 @@ COMMON_DEPEND="
 	>=x11-libs/libxklavier-5.1:=
 	x11-libs/pango
 
-	colord? ( >=x11-misc/colord-0.1.14:0= )
+	colord? (
+		>=x11-misc/colord-0.1.14:0=
+	)
 	input_devices_wacom? (
 		>=dev-libs/libwacom-0.7:=
-		>=x11-libs/libXi-1.2 )
+		>=x11-libs/libXi-1.2
+	)
 	networkmanager? (
 		>=gnome-extra/nm-applet-1.2.0
 		>=net-libs/libnma-1.8.34
 		>=net-misc/networkmanager-1.2.0[modemmanager?]
 
-		modemmanager? ( >=net-misc/modemmanager-0.7 )
+		modemmanager? (
+			>=net-misc/modemmanager-0.7:=
+		)
 	)
 	gnome-online-accounts? (
-		>=net-libs/gnome-online-accounts-3.18.0
+		>=net-libs/gnome-online-accounts-3.18.0:=
 	)
 "
 RDEPEND="
 	${COMMON_DEPEND}
 	x11-themes/adwaita-icon-theme
 
-	colord? ( >=gnome-extra/gnome-color-manager-3 )
-	input_devices_wacom? ( gnome-extra/cinnamon-settings-daemon[input_devices_wacom] )
-	systemd? ( >=sys-apps/systemd-31 )
-	!systemd? ( app-admin/openrc-settingsd )
+	colord? (
+		>=gnome-extra/gnome-color-manager-3
+	)
+	input_devices_wacom? (
+		gnome-extra/cinnamon-settings-daemon[input_devices_wacom]
+	)
+	systemd? (
+		>=sys-apps/systemd-31
+	)
+	!systemd? (
+		app-admin/openrc-settingsd
+	)
 "
 DEPEND="
 	${COMMON_DEPEND}
@@ -72,6 +85,12 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	# Fix optional wayland
+	# https://github.com/linuxmint/cinnamon-control-center/pull/323
+	"${FILESDIR}/${PN}-6.0.0-fix-optional-wayland.patch"
+)
+
 src_prepare() {
 	default
 	python_fix_shebang meson_install_schemas.py
diff --git a/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-6.0.0-fix-optional-wayland.patch b/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-6.0.0-fix-optional-wayland.patch
new file mode 100644
index 000000000000..2aab3af02146
--- /dev/null
+++ b/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-6.0.0-fix-optional-wayland.patch
@@ -0,0 +1,48 @@
+From 1f90a561e4ba0e7431aeb64602e293b05a09be15 Mon Sep 17 00:00:00 2001
+From: Sparky Bluefang <sparky@bluefang-logic.com>
+Date: Sun, 7 Jan 2024 21:46:36 -0500
+Subject: [PATCH] Fix optional wayland handling in cc-display-panel
+
+---
+ meson.build                       | 1 +
+ panels/display/cc-display-panel.c | 6 ++++++
+ 2 files changed, 7 insertions(+)
+
+diff --git a/meson.build b/meson.build
+index 6c3d5e3..11aafd5 100644
+--- a/meson.build
++++ b/meson.build
+@@ -196,6 +196,7 @@ final_message = [ '',
+   '** Colord support (Color management panel)         : @0@'.format(colord.found()),
+   '** Wacom support (Wacom panel)                     : @0@'.format(libwacom.found()),
+   '** Online-Accounts support (Online-Accounts panel) : @0@'.format(goa.found()),
++  '** Wayland support                                 : @0@'.format(cc.has_header('gdk/gdkwayland.h', dependencies: gtk)),
+   '',
+ ]
+ message('\n'.join(final_message))
+diff --git a/panels/display/cc-display-panel.c b/panels/display/cc-display-panel.c
+index 5a513b4..0676f66 100644
+--- a/panels/display/cc-display-panel.c
++++ b/panels/display/cc-display-panel.c
+@@ -28,7 +28,9 @@
+ 
+ #include <libcinnamon-desktop/cdesktop-enums.h>
+ #include <math.h>
++#ifdef GDK_WINDOWING_WAYLAND
+ #include <gdk/gdkwayland.h>
++#endif
+ 
+ #include <libupower-glib/upower.h>
+ 
+@@ -114,7 +116,11 @@ struct _CcDisplayPanel
+ 
+ CC_PANEL_REGISTER (CcDisplayPanel, cc_display_panel)
+ 
++#ifdef GDK_WINDOWING_WAYLAND
+ #define WAYLAND_SESSION() (GDK_IS_WAYLAND_DISPLAY (gdk_display_get_default()))
++#else
++#define WAYLAND_SESSION() (FALSE)
++#endif
+ 
+ static void update_bottom_buttons (CcDisplayPanel *panel);
+ static void apply_current_configuration (CcDisplayPanel *self);
diff --git a/gnome-extra/cinnamon-desktop/Manifest b/gnome-extra/cinnamon-desktop/Manifest
index 540edd2d4fa3..05ce89062bf5 100644
--- a/gnome-extra/cinnamon-desktop/Manifest
+++ b/gnome-extra/cinnamon-desktop/Manifest
@@ -1,5 +1,6 @@
-DIST cinnamon-desktop-5.6.2.tar.gz 502140 BLAKE2B b96be728da24a43b88a14b7cd5e9dd6313c753e32e7f2dcb2a5ac4f2c8eb27266f261a1a1e5499d9a94ccbc679d9c4ea9cdaae4ee6b1187de44d518a9a483ca7 SHA512 cfa50697991c41916f53d2e902ff37671e547e362cb8c70eace1b482a97bf139b6a28375d0e399c738cb705ca3aa8768c3ecd13551b677c5446288259ed5deeb
+AUX cinnamon-desktop-6.0.0-fix-idle-monitor-dbus.patch 3463 BLAKE2B 2d52681a98eb18e8706934bea2922c3974b97b162d2c93c75bf18b3f040015614c4f440faf8554fe09df314084d5a44052502a1e4836a33f1999375923cd562d SHA512 faed2bf7f43ee85dc302ffc8b42fdf95b20ab7f658ca921ced5999e7b798a91507ae56cf942f1245e850dd26c1755bb64a922a874b55c6eca0aeaad2d5f6be74
 DIST cinnamon-desktop-5.8.0.tar.gz 502547 BLAKE2B 58be0fcfccce58036bbf867d9619b78bc5357b431e92fc8777a0d102db0ee1abb640d60f429e82afd909dde49764858b3af872aadc55a1c642a3771f0e154f38 SHA512 93c86d8269c39b84463ca102581e45d9b29a55c402bb040198972614fda2d81e075ec96cbaa859cef15dc3439b31329722f45ed637026b6d6a43d71ac6afb246
-EBUILD cinnamon-desktop-5.6.2.ebuild 1426 BLAKE2B 5b1b53d0362e61ee6de7a4ccfd092675a85c7a3ff42af9bfb0b9e48ffa685810884c6393b3807705fb185a80cbcd5591a57039c574e6907e180aaccd851186b0 SHA512 db0323aee5b1b1278284a200e90d1925731b883aa84d97242f7038c26f26570d88345239b983000bd0c23f29ac5d1d920f8cb55099bb4eb013b3b6a4a8aef493
+DIST cinnamon-desktop-6.0.0.tar.gz 509871 BLAKE2B 908b53445327cdbb5560655700e6dfa829934714167f02dda2d9d31a02ae85fcf6565704e791f67f0725e9eb76ed65ef26944d3fac2a58e3091b2afd10bb70af SHA512 35c09c6c3b9563c27561624bb731f17dd4f07b4e5aca5af39ffd56f72fa271babb4fd2cfe7080ac078b0d9141fcbc904036f3f156c547d64e68ba53eea14a471
 EBUILD cinnamon-desktop-5.8.0.ebuild 1433 BLAKE2B 8bc706331c4896c55fef831354a2d384a3a1a2e31d7d7456e5c4c9fa7fb8742d9f8316ba177b3451d54f820863b253a3792933e87c15408b14ffa1cc0395c1d9 SHA512 0e373ede140eab67a7b3b42ceb08edc9322251182331c73b44042fcdd94ac2107a6d257491f6a13d4f099a39afc5dfcbffdc7563571e9aacc7cd45583428cd7c
+EBUILD cinnamon-desktop-6.0.0.ebuild 1700 BLAKE2B a2e1adeaf5902acd87f982937487a57c1abaa72a05bb844b66340ea533215ffb482549af56c1ecea25d16fc7b167df41584f9d3b38549dfd01b64a9be100874b SHA512 c781f82fe2a8f994ad291e50254783158d4cad2a173d68c4c55ce87301fc969863aa4c0f2bac039bb7c27420d35ac41be04c539aecb40e35f0567e955f17f3f0
 MISC metadata.xml 496 BLAKE2B c019ef51b10de9ccafed1294e6d436dcdc8f02735170afe9e038689c6c4d76fb3e099bc9ec7f10c2a50d2bfa5e1d1c191667a470d734effad53d9d299f431664 SHA512 41a99dd4e1aad85dda44e2168bc150e2c27bb40a45c0dfe0f085e502242e6a0704ad8b47f64140d81afa7ff096cac735c46827f3d949962400de92d769505cc4
diff --git a/gnome-extra/cinnamon-desktop/cinnamon-desktop-5.6.2.ebuild b/gnome-extra/cinnamon-desktop/cinnamon-desktop-6.0.0.ebuild
index 5d30638f5267..b1163814b407 100644
--- a/gnome-extra/cinnamon-desktop/cinnamon-desktop-5.6.2.ebuild
+++ b/gnome-extra/cinnamon-desktop/cinnamon-desktop-6.0.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit meson gnome2-utils python-any-r1
 
@@ -13,7 +13,8 @@ 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 ~ppc64 ~riscv x86"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="systemd"
 
 RDEPEND="
 	>=dev-libs/glib-2.37.3:2[dbus]
@@ -30,6 +31,9 @@ RDEPEND="
 	x11-libs/libxkbfile
 	>=x11-libs/libXrandr-1.3
 	x11-misc/xkeyboard-config
+	systemd? (
+		sys-apps/systemd
+	)
 "
 DEPEND="
 	${RDEPEND}
@@ -37,11 +41,17 @@ DEPEND="
 "
 BDEPEND="
 	${PYTHON_DEPS}
+	dev-util/gdbus-codegen
 	dev-util/glib-utils
 	sys-devel/gettext
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	# https://github.com/linuxmint/cinnamon-desktop/commit/d0f8c74a7864786cf040da31c7db83d8d2fcc5e4
+	"${FILESDIR}/${PN}-6.0.0-fix-idle-monitor-dbus.patch"
+)
+
 src_prepare() {
 	default
 	python_fix_shebang install-scripts
@@ -50,6 +60,7 @@ src_prepare() {
 src_configure() {
 	local emesonargs=(
 		-Dpnp_ids="${EPREFIX}/usr/share/hwdata/pnp.ids"
+		$(meson_feature systemd)
 	)
 	meson_src_configure
 }
diff --git a/gnome-extra/cinnamon-desktop/files/cinnamon-desktop-6.0.0-fix-idle-monitor-dbus.patch b/gnome-extra/cinnamon-desktop/files/cinnamon-desktop-6.0.0-fix-idle-monitor-dbus.patch
new file mode 100644
index 000000000000..76fa5c53cde6
--- /dev/null
+++ b/gnome-extra/cinnamon-desktop/files/cinnamon-desktop-6.0.0-fix-idle-monitor-dbus.patch
@@ -0,0 +1,80 @@
+From d0f8c74a7864786cf040da31c7db83d8d2fcc5e4 Mon Sep 17 00:00:00 2001
+From: Michael Webster <miketwebster@gmail.com>
+Date: Mon, 15 Jan 2024 15:16:08 -0500
+Subject: [PATCH] gnome-idle-monitor.c: Fix some dbus names Mutter->Muffin.
+
+The session manager uses this to get notifications about idle
+state changes now - instead of its own idle-monitor code (which
+only worked with x11), it now relies on muffin to notify on
+changes from various sources (xorg, wayland, upower).
+---
+ libcinnamon-desktop/gnome-idle-monitor.c | 6 +++---
+ libcinnamon-desktop/idle-monitor.xml     | 4 ++--
+ libcinnamon-desktop/meson.build          | 2 +-
+ 3 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/libcinnamon-desktop/gnome-idle-monitor.c b/libcinnamon-desktop/gnome-idle-monitor.c
+index 71d8918..81aaaab 100644
+--- a/libcinnamon-desktop/gnome-idle-monitor.c
++++ b/libcinnamon-desktop/gnome-idle-monitor.c
+@@ -67,7 +67,7 @@ G_DEFINE_TYPE_WITH_CODE (GnomeIdleMonitor, gnome_idle_monitor, G_TYPE_OBJECT,
+              G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE,
+                         gnome_idle_monitor_initable_iface_init))
+ 
+-#define IDLE_MONITOR_PATH "/org/gnome/Mutter/IdleMonitor/Core"
++#define IDLE_MONITOR_PATH "/org/cinnamon/Muffin/IdleMonitor/Core"
+ 
+ static void
+ on_watch_fired (MetaDBusIdleMonitor *proxy,
+@@ -256,7 +256,7 @@ on_name_appeared (GDBusConnection *connection,
+     meta_dbus_object_manager_client_new (connection,
+                          G_DBUS_OBJECT_MANAGER_CLIENT_FLAGS_NONE,
+                          name_owner,
+-                         "/org/gnome/Mutter/IdleMonitor",
++                         "/org/cinnamon/Muffin/IdleMonitor",
+                          monitor->priv->cancellable,
+                          on_object_manager_ready,
+                          monitor);
+@@ -296,7 +296,7 @@ gnome_idle_monitor_initable_init (GInitable     *initable,
+     monitor = GNOME_IDLE_MONITOR (initable);
+ 
+     monitor->priv->name_watch_id = g_bus_watch_name (G_BUS_TYPE_SESSION,
+-                             "org.gnome.Mutter.IdleMonitor",
++                             "org.cinnamon.Muffin.IdleMonitor",
+                              G_BUS_NAME_WATCHER_FLAGS_NONE,
+                              on_name_appeared,
+                              on_name_vanished,
+diff --git a/libcinnamon-desktop/idle-monitor.xml b/libcinnamon-desktop/idle-monitor.xml
+index 4bd69cb..5203883 100644
+--- a/libcinnamon-desktop/idle-monitor.xml
++++ b/libcinnamon-desktop/idle-monitor.xml
+@@ -3,14 +3,14 @@
+ 'http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd'>
+ <node>
+   <!--
+-      org.gnome.Mutter.IdleMonitor:
++      org.cinnamon.Muffin.IdleMonitor:
+       @short_description: idle monitor interface
+ 
+       This interface is used by gnome-desktop to implement
+       user activity monitoring.
+   -->
+ 
+-  <interface name="org.gnome.Muffin.IdleMonitor">
++  <interface name="org.cinnamon.Muffin.IdleMonitor">
+     <method name="GetIdletime">
+       <arg name="idletime" direction="out" type="t"/>
+     </method>
+diff --git a/libcinnamon-desktop/meson.build b/libcinnamon-desktop/meson.build
+index fbab37a..61976c9 100644
+--- a/libcinnamon-desktop/meson.build
++++ b/libcinnamon-desktop/meson.build
+@@ -1,7 +1,7 @@
+ dbus_idle_built_sources = gnome.gdbus_codegen('meta-dbus-idle-monitor',
+   'idle-monitor.xml',
+   namespace: 'MetaDBus',
+-  interface_prefix: 'org.gnome.Muffin',
++  interface_prefix: 'org.cinnamon.Muffin',
+   object_manager: true
+ )
+ 
diff --git a/gnome-extra/cinnamon-menus/Manifest b/gnome-extra/cinnamon-menus/Manifest
index 09b80547e7f3..2a42e44452c8 100644
--- a/gnome-extra/cinnamon-menus/Manifest
+++ b/gnome-extra/cinnamon-menus/Manifest
@@ -1,5 +1,5 @@
-DIST cinnamon-menus-5.6.0.tar.gz 96166 BLAKE2B 84b3d513b6dbea253135df1f0f8ad017d78299b8cdd2bd2e7def547b74b59e998d3c37e30d480532802fb85db261242d51485f8fbeb7742310eee288de909aa1 SHA512 023f1d4eededbc5a1052e219c4ede9808eb489fe399346d643b2209c8b37b8432647043ac05afd653666efa2830ebbd73222033bdfbc52f2904e7a1e1bbc27df
 DIST cinnamon-menus-5.8.0.tar.gz 96346 BLAKE2B 3da1b4b3056d5fc0ec8fa22e01c160de4e61c05cf3ad10f216a95abcc63135f394146bfd1d77a54021e5aedee4b5d61077eadf49823171f5f5aa052d4c1947d6 SHA512 d7679412cca5537da47767a0bb9335deaf7177781bee26bec109e9c19c90f4fbaeba81837ce1b9203e5315185178bc720919bdfbb072a94c5a816d1ee63a0370
-EBUILD cinnamon-menus-5.6.0.ebuild 810 BLAKE2B 4e2d9b179d33161cc874c6326ff77e68ef09d5a3d7bdc1ad04807d853dbbe6a64e36fe461edb77f096125d73b12df19f2dd2ff75e9c0d334b6372c5bcdf98286 SHA512 5477d9b75df1b8a0c0fa231b18049d6efa13f9f46e0234a688f3ff4dbd81704b3862a0d5ce8c8c162be9a80b90985dd751e41aaa3a8fdfdeefbd15cccf35bb48
+DIST cinnamon-menus-6.0.0.tar.gz 96411 BLAKE2B 08394d32e66a8e3e8f1e13a97128099c1fcfe868a52c6bdbdd9ad1c98508c441d8b354d37856dd645db8a9e8f33c3f1ad3c6033bd2f22ea33d7644594cc1559f SHA512 9b7e1f92ef451e80aebc95a2fdd0e94e352c634a09474878fb12cf0ba8a06e3b4ca522ab6b6c768b7b194cb262bad0bfd5b81557d77cb9075506de11d9de56a7
 EBUILD cinnamon-menus-5.8.0.ebuild 817 BLAKE2B 190a14cbbe09e6dbdceea606460b56eb04ea06b4a937eb4ccee7cb5e18c2c672d39995fecf1900fd4a249d9041f3f98d126d3803f287436989c4c12dbc864b01 SHA512 620a56d91a6b874f6e5f334b686d701e9b315acef31a90561a3f872aa7a5fa81dde79c662d24733b96772684cb72126a235751d0448230de92fcc4f121fa5361
+EBUILD cinnamon-menus-6.0.0.ebuild 819 BLAKE2B f60439eeeaf7f3e1d1314f12b2d443599372b01de415e6612d1e6ee34953b98f5fe6b3338693f0f053b141f1f8281cf39e11b8f4c1506574e3b7a095e2334e6c SHA512 4c5b2db55850b8e7a2dc6a32f9270bdee71a534a11265bd58a10985be4da5bb2507d8839a9a39b651dca9f1aaef6ea89ac1fb69bf1eeffd44758f9b10a693451
 MISC metadata.xml 494 BLAKE2B a27fd494a680cb42a41c806166cf6ce2f2df3d132d62af9e4a4f8c7ae66ecc93b05afc64e250122cdd62bad428fc065984ab68e31c0d6c5be2a070a8dc912d7b SHA512 1fe1a31acf83ea9070318e76a6acb09969c7dac0779292822a7d1800ac7be4392a26091a59bceeb3ce84381d95159c9c2c1cdb30e567c2b2896a2a02564656ff
diff --git a/gnome-extra/cinnamon-menus/cinnamon-menus-5.6.0.ebuild b/gnome-extra/cinnamon-menus/cinnamon-menus-6.0.0.ebuild
index 093762fcca4f..860d1ec26eb1 100644
--- a/gnome-extra/cinnamon-menus/cinnamon-menus-5.6.0.ebuild
+++ b/gnome-extra/cinnamon-menus/cinnamon-menus-6.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/linuxmint/cinnamon-menus/archive/${PV}.tar.gz -> ${P
 
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="gtk-doc"
 
 RDEPEND="
diff --git a/gnome-extra/cinnamon-screensaver/Manifest b/gnome-extra/cinnamon-screensaver/Manifest
index d04bdf8ca37b..8c69627b5f75 100644
--- a/gnome-extra/cinnamon-screensaver/Manifest
+++ b/gnome-extra/cinnamon-screensaver/Manifest
@@ -1,5 +1,5 @@
-DIST cinnamon-screensaver-5.6.3.tar.gz 157834 BLAKE2B 50728147fcb5849998113d5f19393e89f2cb4c5610359b81b42853fc2378814a52a8ed4f829cdd4e546a705a594da7b958ab25f69f996ee3d2204a64b7fdba90 SHA512 632bc9b518e59be7ce32c22ccfa32da060ea9edabe1683f91f2bf3c716fdcd7ca95fe4bda595ccc99821405bfbd987df2a416f229de56b3139f8d9975453ad39
 DIST cinnamon-screensaver-5.8.1.tar.gz 158825 BLAKE2B ebbbc0690f3a423b300a2be045fbf07953278992c48cc5182bc1b31944afb15a19103b13752adea64083d6cb14406b04610285e11b9f52f0aa48d9e9d1a41e15 SHA512 ac7523816be3d4b3a70afe0117e44b5cb42cd72f52534ca33ad0e3ab94f666d382d952a7c7842dd5dfd36520779695056775d243aee6df1845c7d90ccb7172ae
-EBUILD cinnamon-screensaver-5.6.3.ebuild 1664 BLAKE2B 9a08a50a61eace4ab74b2e178a1e4953956c55e8f0fac91c25a7566732b4378cf1a6668181f4b2921a2d27fa7a006f774769078e7f7fb514b26161dc2f714f44 SHA512 e2e1e0ffb8e9a48d6c979f03b42747cf968e32b9065a35c97e2725529612c82c7e3010a4dd81c9753855ea987c636a403940707b1169b8a1b329ef1327a045c0
+DIST cinnamon-screensaver-6.0.3.tar.gz 161006 BLAKE2B 4f88cf0ca72384fbff2ce1f55047b6d53704bf55b2a3bfd5c942c19bcfbe9249c07e9fc1f08246c0e55c6b2110f543157ec87028789e58d752ff21d54d347ae2 SHA512 556b8eeac280001273460e5f1f5d1e5dbdf003ff95ad1ec9c3217316a6197520a32cd05d61a395daef066f13c8c9c89ebb9057779dd845bd597c207492fd91ef
 EBUILD cinnamon-screensaver-5.8.1.ebuild 1707 BLAKE2B df50eaea65e4fc9f113db5ad8f51a7241ab683e7417e4d992d44e9ea6cb210e142aad0ea9d97c955a8a61c3ad898315b1cb89e235ff8bb128b738d6ef28609fa SHA512 e5026951c7eb5406709f1ff54bc3e7907c10112e8a1f7fe5e754974e8b7b2c666b5d84dbf69dbd450fa4a67f32b3508f244c8fceba517848746750ee619fb516
+EBUILD cinnamon-screensaver-6.0.3.ebuild 1694 BLAKE2B 90f59da7076df6fbd04a362681a7245f2e989542bb571a6d139fb4cd43bea39c5e7423bfe43f2cd05b5fe1ccec171662cde8deb16f4eb35777086721d94deb7f SHA512 51e9ecd6c04f81f1b9d63e7a38b9aa3ff5916572550f78e1edd45c462c9b0b1738d1f60b63b6d0acb9361d10eb6fff9596ad14ad30e9a33412219ddcba3b978d
 MISC metadata.xml 500 BLAKE2B 92b85c1d68491b0e4f88203070760f1e8d2b51b3bf9d3615e18a26cdaf6466eadaa700f18f1668a9b214a540fe01639a49a8535cd43435ddba192fef0267ce98 SHA512 35fc95aac49117f0bd643ccd17d2e461ad1cc5dc744256f6cf83f4248c087b33f66eb4352aeae8105983789e7f8ca74727fc48557f462edfba658d411bb536f7
diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-5.6.3.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-6.0.3.ebuild
index d04e40943ccd..d5f75bebf4b5 100644
--- a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-5.6.3.ebuild
+++ b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-6.0.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit meson python-single-r1 xdg
 
@@ -15,12 +15,12 @@ LICENSE="GPL-2+ LGPL-2+ MIT"
 SLOT="0"
 IUSE="systemd xinerama"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
 
 COMMON_DEPEND="
 	${PYTHON_DEPS}
 	>=dev-libs/glib-2.37.3:2[dbus]
-	>=gnome-extra/cinnamon-desktop-5.6
+	>=gnome-extra/cinnamon-desktop-6.0
 	sys-libs/pam
 	>=x11-libs/gtk+-3.22:3[introspection]
 	x11-libs/cairo
@@ -36,12 +36,14 @@ COMMON_DEPEND="
 RDEPEND="
 	${COMMON_DEPEND}
 	>=app-accessibility/caribou-0.3
-	sys-apps/accountsservice[introspection]
+	sys-apps/accountsservice
+	sys-process/procps
+	x11-apps/xprop
 	$(python_gen_cond_dep '
 		dev-python/psutil[${PYTHON_USEDEP}]
 		dev-python/pygobject:3[${PYTHON_USEDEP}]
 		dev-python/setproctitle[${PYTHON_USEDEP}]
-		>=dev-python/python3-xapp-2.4.0[${PYTHON_USEDEP}]
+		>=dev-python/python3-xapp-2.4.1[${PYTHON_USEDEP}]
 	')
 
 	systemd? ( >=sys-apps/systemd-31 )
diff --git a/gnome-extra/cinnamon-session/Manifest b/gnome-extra/cinnamon-session/Manifest
index d562f35eaf9f..07c228dd4c0e 100644
--- a/gnome-extra/cinnamon-session/Manifest
+++ b/gnome-extra/cinnamon-session/Manifest
@@ -1,5 +1,6 @@
-DIST cinnamon-session-5.6.0.tar.gz 199389 BLAKE2B ecd8152af4784affc8c9b8ae7ca48adaecca4355c2db5d64ca577f44abc0ff35cf27ef324fa9d3520c125bc979727bbab67f99209e5a641ad0329a26025698b5 SHA512 260acb2a4e7016af3be2865d51eb947774020fc4e333e6a4ce72664d182c098f663d1878ac2194607f04517c3ea6916d2bfc5e55749f8252a38205b227d40335
+AUX cinnamon-session-6.0.0-fix-optional-systemd.patch 605 BLAKE2B 29057363842f23a5b37583ab5d2cf312fbf31f9ef78b66e9b70980051771cc701f9e5b811d03d3534046c2cb76fda1751fc11b36cbcf90685b6fc05dd3773158 SHA512 7b89ef4d9915d50377c0ad10a1296a6bd5a11dbb2f30b2e2531aa817335776d08823b4a6401c0d4638f0d89674d91c3165aafa0b217dd488e7127e8fbc6ba9c6
 DIST cinnamon-session-5.8.1.tar.gz 199477 BLAKE2B 9371089e3caa4765498c2fa3ab9e5de03d47a67bced8a1a14fec33d7aea3372950b1e8f7f88be825697c8a2899dc0812f6ec7c5fb008f4bf2f4b5bdc343c01cc SHA512 8a88834a639c74b227f0d666fa2bcb4c3f73859ff8de84a440e84af3f3343c41c47a896ccf0dc09cc7114b7c921e2f670aec7846c57ec92b8da3333be7955309
-EBUILD cinnamon-session-5.6.0-r1.ebuild 1413 BLAKE2B e32f2bb811a566993d8ada800a8979154cfd3e6c5b4318c0d1726686ac8d294c3d232895b5c6f27c1205bc8732257da2e42625e20f31e2b800f46e4880bc4e66 SHA512 2f8824a165a5573f276db51d97b573f7eb9a92b66294acb6f7ed459d719af77371a768b09abb47600f030b5746aa9b55e07eaa31a32b93f60fd072490c6c4a7d
+DIST cinnamon-session-6.0.2.tar.gz 165188 BLAKE2B 077552f147a61d4615db8091411314560a12b5c40420381280e41a35395119ece15602f9c74bac3409b49d4363285a386555a787ced10dee5ca757d254ccb7ec SHA512 80e1c5b8654aad805424351c1a49cc3f68e52ddcf0606180fd5ee006607829f4f451c6bdd9be7e022a258041e8a6967faf0b16b8536a0a8982dcc805e35fd01a
 EBUILD cinnamon-session-5.8.1.ebuild 1420 BLAKE2B 45ec08fd6e7e8772785f60316986776e407293cd6e8113d0d6d46e5bd3124268c0ce670bbe93bef8aa01314d122bf2f71cc69e951124d6d7cef986f515b0aa34 SHA512 45daba06db4328d5fb0a1b80e16c4abdf649de6c48a29ded174bfa8a4fb8e7cbd8b6525612f4b0ab458d5c11ae34ede09838c464daf79d96366ab9d5b2379da8
+EBUILD cinnamon-session-6.0.2.ebuild 1838 BLAKE2B fd3446f09a2f605756c37ea23ad53b25cd39acc780541167dd00fa620de8fa0be4e7f54c36501a5eb11c6f375071721f4f074c0b570e7ac1bc0f7d7b060deb7e SHA512 309088c8d9f6a81786b3dfef4987e448316057047a90902b3520f2d39efaf1968cead9664c3a362efbe8031a5ea835be0bd238fe0d0ea6be9a1ed69f9b94fa0d
 MISC metadata.xml 496 BLAKE2B 3b3170a447d7818cdd93b3183feee36751832a07da741b16dfdfe029e09733f3ba94815312e6444b3421dd7bc3df9b4ca2f1c1ac2a5d83ae3881b1ab7cf809c0 SHA512 65d223bf44f83d8d2bda72791b362c4302ec813e9090331cf5ddc97e10ed610c1a91c6d467ff72d7e1430e7d70dcfa09f9c8e35c50a86130236798c80e19a2f2
diff --git a/gnome-extra/cinnamon-session/cinnamon-session-5.6.0-r1.ebuild b/gnome-extra/cinnamon-session/cinnamon-session-6.0.2.ebuild
index 72fcdd267568..cefd1f0a4183 100644
--- a/gnome-extra/cinnamon-session/cinnamon-session-5.6.0-r1.ebuild
+++ b/gnome-extra/cinnamon-session/cinnamon-session-6.0.2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
-inherit meson gnome2-utils python-any-r1 xdg-utils
+inherit meson gnome2-utils python-single-r1 xdg-utils
 
 DESCRIPTION="Cinnamon session manager"
 HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon-session"
@@ -13,16 +13,18 @@ SRC_URI="https://github.com/linuxmint/cinnamon-session/archive/${PV}.tar.gz -> $
 
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="systemd"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 COMMON_DEPEND="
 	>=dev-libs/glib-2.37.3:2
+	>=gnome-extra/cinnamon-desktop-6.0:0=
 	media-libs/libcanberra[pulseaudio]
 	virtual/opengl
 	x11-libs/cairo
 	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3:3
+	>=x11-libs/gtk+-3:3[introspection]
 	x11-libs/libICE
 	x11-libs/libSM
 	x11-libs/libX11
@@ -32,10 +34,14 @@ COMMON_DEPEND="
 	x11-libs/libXrender
 	x11-libs/libXtst
 	x11-libs/pango[X]
-	>=x11-libs/xapp-2.4.1
+	>=x11-libs/xapp-2.8.1[introspection]
 
-	systemd? ( >=sys-apps/systemd-183 )
-	!systemd? ( sys-auth/elogind[policykit] )
+	systemd? (
+		>=sys-apps/systemd-183
+	)
+	!systemd? (
+		sys-auth/elogind[policykit]
+	)
 "
 DEPEND="
 	${COMMON_DEPEND}
@@ -43,7 +49,12 @@ DEPEND="
 "
 RDEPEND="
 	${COMMON_DEPEND}
-	>=gnome-extra/cinnamon-desktop-5.6:0=
+	${PYTHON_DEPS}
+	dev-libs/gobject-introspection
+	$(python_gen_cond_dep '
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		dev-python/setproctitle[${PYTHON_USEDEP}]
+	')
 "
 BDEPEND="
 	${PYTHON_DEPS}
@@ -51,9 +62,15 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	# Fix bad systemd include
+	# https://github.com/linuxmint/cinnamon-session/pull/164
+	"${FILESDIR}/${PN}-6.0.0-fix-optional-systemd.patch"
+)
+
 src_prepare() {
 	default
-	python_fix_shebang data
+	python_fix_shebang data cinnamon-session-quit
 }
 
 src_configure() {
diff --git a/gnome-extra/cinnamon-session/files/cinnamon-session-6.0.0-fix-optional-systemd.patch b/gnome-extra/cinnamon-session/files/cinnamon-session-6.0.0-fix-optional-systemd.patch
new file mode 100644
index 000000000000..cee6e14b8fe1
--- /dev/null
+++ b/gnome-extra/cinnamon-session/files/cinnamon-session-6.0.0-fix-optional-systemd.patch
@@ -0,0 +1,21 @@
+From 44ac74ea7e771a35a41235b4e7d2539d4521b626 Mon Sep 17 00:00:00 2001
+From: Sparky Bluefang <sparky@bluefang-logic.com>
+Date: Tue, 2 Jan 2024 23:26:20 -0500
+Subject: [PATCH] Remove orphaned include
+
+---
+ cinnamon-session/main.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/cinnamon-session/main.c b/cinnamon-session/main.c
+index 49d1e32..802a1ae 100644
+--- a/cinnamon-session/main.c
++++ b/cinnamon-session/main.c
+@@ -40,7 +40,6 @@
+ #include "csm-session-fill.h"
+ #include "csm-store.h"
+ #include "csm-system.h"
+-#include <systemd/sd-journal.h>
+ 
+ #define CSM_DBUS_NAME "org.gnome.SessionManager"
+ 
diff --git a/gnome-extra/cinnamon-settings-daemon/Manifest b/gnome-extra/cinnamon-settings-daemon/Manifest
index b2e9a0523d71..bf24935540d6 100644
--- a/gnome-extra/cinnamon-settings-daemon/Manifest
+++ b/gnome-extra/cinnamon-settings-daemon/Manifest
@@ -1,5 +1,5 @@
-DIST cinnamon-settings-daemon-5.6.2.tar.gz 572785 BLAKE2B eef91b591db1c0e546897c88c171aaf103c3ad619ea0ab31dca09e78ae18993f63b4b29ca82a3dc1bcd1def871845b1753f462e347f11c48dac729b844da20b2 SHA512 f3c08b50889e42510ef423d18d0fe0c55bf2c9c4fa436d16864eb477b7dcb055a50973e2d5f7a4339d1094dc760c5ad05848a6e13dffa87f6fb8cad1f76b970d
 DIST cinnamon-settings-daemon-5.8.1.tar.gz 573541 BLAKE2B 50d8e6fb1fde50db7cc40c931e0904c0abfa429dc5757160fdb87ee2753f4d9e732ba4a0837c0480a73a3caffb084881c8aac336f8600afe976adc519b09aa01 SHA512 a5e92aa9ba463cff7db02e9d377a28b39e4c1dd25226ab9d4d59b5fd7b38267c6da5f31cfa052f1a8243de601c7484040be158e633b8932e2e68726860c7bfc3
-EBUILD cinnamon-settings-daemon-5.6.2.ebuild 2135 BLAKE2B 8575f496ab2d41b20c3b238ced4d8eadfbbed3a221a21e35a3a61b97f510477676578f585eb8d4149d792f8162df9dd079008f33e27d849f630f54ea799eec79 SHA512 d8becd19a21d3e0f5dc2ccf76e87987c0c6fc5a6fac5671e3a1f96c229c015e7d9a563a07b6a166ee3a12ba4d7d89aefedc6ce8b642d9b3618557929444616ff
+DIST cinnamon-settings-daemon-6.0.0.tar.gz 578061 BLAKE2B f05e14e9d3c15bc94df5435b0f317e1924993fbf4908491ea5a825b623c6a6f127ce20f5c31f54bfbd547a70ad645c3dbe71d9c55f790a3e0730d55bc58d6316 SHA512 44348765bf8c0cb941d177a6765aef10796d72f5c215dbffa4b514523956e257128d6bbbb0dcd9c3f0b2bcde24745e082ad82a7cee149125903e13b349c07200
 EBUILD cinnamon-settings-daemon-5.8.1.ebuild 2161 BLAKE2B 23e3ba0b82e1dbb60ff2d44944701d9a741cdd723bc80222fffc21a236f9794c6a1b37302fdb52b13ed7c4b6315ce00b8d83565325449359156c8b3c8e02cc7f SHA512 0548f408b04f27f2dd1ed73c49d0d0ef640c2e2cea34542146f239a45b1b52ab80cd6bb844fa60c2c3045f0df36a54aa4da6420ea336a9fd0ece0903840bd71f
+EBUILD cinnamon-settings-daemon-6.0.0.ebuild 2181 BLAKE2B 3dbde6e25a2d7eab3b1b11d106f15faae7b6fb3723765ae918ce40fcca45e30a4b76d8229fd98554dae6640663ecc8fc1d80d301413c9ce7666eada536cc864f SHA512 dc039646f802bce210bf95b556412456dd420d386e592118e5db481f133cc8a76566715ef5554b4d2964e3e0e0b3797c1e4a386ca4a7501599336bb89e4bc521
 MISC metadata.xml 504 BLAKE2B 99901d6f11af1367053f408c6fc1dffafa3903dc04b9a38faed0b3261e578c33fad49948ce09ecfb6d277472a3f9c3d088a32231b02236677071413dc3d4917e SHA512 f5afa4c1e73b6765aee16c5762b3145223bf4c56cae60b7e65ef503aec0f684276de2a7a22b0b866996cd96376cfc69e36e395ad3da9e7ce593732cb075fd64c
diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-5.6.2.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-6.0.0.ebuild
index bd6f94d1f1ec..83c4fac82c4b 100644
--- a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-5.6.2.ebuild
+++ b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-6.0.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 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+ LGPL-2+ LGPL-2.1 LGPL-2.1+ MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
-IUSE="+colord cups input_devices_wacom smartcard systemd"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="+colord cups input_devices_wacom smartcard systemd wayland"
 
 RDEPEND="
 	>=dev-libs/glib-2.40.0:2[dbus]
 	dev-libs/libgudev
 	>=gnome-base/libgnomekbd-3.6:=
-	>=gnome-extra/cinnamon-desktop-5.6:0=
+	>=gnome-extra/cinnamon-desktop-6.0:0=
 	media-libs/fontconfig
 	>=media-libs/lcms-2.2:2
 	media-libs/libcanberra[gtk3,pulseaudio]
@@ -28,7 +28,7 @@ RDEPEND="
 	>=sys-auth/polkit-0.97
 	x11-libs/cairo
 	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.14.0:3
+	>=x11-libs/gtk+-3.14.0:3[wayland=]
 	>=x11-libs/libnotify-0.7.3
 	x11-libs/libX11
 	x11-libs/libXext
@@ -46,7 +46,10 @@ RDEPEND="
 	input_devices_wacom? (
 		>=dev-libs/libwacom-0.7:=
 		>=gnome-base/librsvg-2.36.2 )
-	smartcard? ( >=dev-libs/nss-3.11.2 )
+	smartcard? (
+		dev-libs/nspr
+		>=dev-libs/nss-3.11.2
+	)
 	systemd? ( sys-apps/systemd:0= )
 	!systemd? ( sys-auth/elogind )
 "
diff --git a/gnome-extra/cinnamon-translations/Manifest b/gnome-extra/cinnamon-translations/Manifest
index 4d3fe425d711..45141cc2eaff 100644
--- a/gnome-extra/cinnamon-translations/Manifest
+++ b/gnome-extra/cinnamon-translations/Manifest
@@ -1,5 +1,5 @@
-DIST cinnamon-translations-5.6.1.tar.gz 12857113 BLAKE2B 51cd8c640b1cc97e5f9dd53d309a3c299dfaf928d9946a90b3d5b5bf9dfb2fc144f47a3547b3cbb15b894fb5daeaa378faebe83c6f28a5be58509a8d87704628 SHA512 e8a32e5b01e6267b4e6684c56401bb9c70088797b1ae102fb8d420bc5bed31cc9064812c7bb6ccb38e192a295affb88a7f5b5808e908d7c0367fa9ec7d05ac9f
 DIST cinnamon-translations-5.8.2.tar.gz 13306978 BLAKE2B 91e71f3f4142fa6adb80c39a782b2db2c1d8f9e3dc12ea5883e081c0b27660a15753e0f4d69a7b4f47b9350221e705ef361e1e5fc1c027b92805ec59b08a9e2a SHA512 ccf678eb805c06932e35e8d44579e2f5b7c3dd4e1cda6a6bd184ef3da656ccbe62135ae960849e4aaf098ebe76b72760a5d542f134210760376f0d972b875279
-EBUILD cinnamon-translations-5.6.1.ebuild 1380 BLAKE2B 0aa8961e466d3022000ac63b4d4b39ed437af3edf335510adb6ff19d4746703c03cc6f3c886025b82dcd3aab9f71926c61265e81d8b107d872a55256daf5253a SHA512 bae0e130b65b9d3018f5b5de465c94878d3335b58bf61a316d4d00b73111f9f2ad525905b33b1aa0a6ca3d24be28df333f6f5018778ba56aff532ae95c5a29ce
+DIST cinnamon-translations-6.0.2.tar.gz 13436254 BLAKE2B 50b9813c608935830c772466ad01f5818d7775467127c486c1543e2c51f4b828b536436939cd50cb68adb562aa043edaed4d10839b8e17038668e0cd87253197 SHA512 e23fe7f7da8856f3794c970671242bfdda1d84fee7357a7d30e09de15f988b9293b49dcbb44687ba4c495708b4fe067d6e8b851fac190b7f1f123ae19745f375
 EBUILD cinnamon-translations-5.8.2.ebuild 1391 BLAKE2B 08bece8f453cb891622632d6046116883a7e06e0248cf3a1acd89c6a56f5ef7f4ef92360eeb6760a5e27a71a4139cb908e839ab12aeae4de06c525b03a8e6c92 SHA512 c56f6da7e4230e55cd81694482f7e25bbfa4b16387a805c3dd321901207d5c3fc7be81077c896c691f88c01412cc5762f3783fcfa69bcec8762b5e695561c68f
+EBUILD cinnamon-translations-6.0.2.ebuild 1393 BLAKE2B da6e3a8111246ec603d0f474a2ce2d3f1a795bdda48f7f3f00ef0bc0b02bec104f9b17498e12d2fd91845cc0ca547e8cdd892df14c4cc5d392bcd8ec8773282d SHA512 d65d54dbcda5becbe898a83f27553ecd2f6758c74e49c892365fb182ce15d2343312ba78dabd153adaebcec90c5054c513839fa458a74385e5b03deff25de72c
 MISC metadata.xml 501 BLAKE2B 79e5e721119bb7673c44beae1cfdb6d6987a028a3b16971170ba860c4edf845c6c51c236e4de5430a005e65dd364ea34937d821d47941ad03dbe4da436f6d729 SHA512 4a44ddca6b9e365a71f358d68d24b5cfe62d0cecbfe7c3b86e55c1e5d12e926414f7ae5bc73817eeac3c915f6a9aebfa141b7b880fa6f45d58d01225e2bb1cc3
diff --git a/gnome-extra/cinnamon-translations/cinnamon-translations-5.6.1.ebuild b/gnome-extra/cinnamon-translations/cinnamon-translations-6.0.2.ebuild
index 3a0b67cb491a..6e064d7aa4a4 100644
--- a/gnome-extra/cinnamon-translations/cinnamon-translations-5.6.1.ebuild
+++ b/gnome-extra/cinnamon-translations/cinnamon-translations-6.0.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PLOCALES="aa af am an ar ary as ast ay az be be@latin ber bg bn bn_IN br bs ca ca@valencia crh cs csb cy da de dz el en@shaw en_AU en_CA en_GB en_IE en_NZ en_ZA eo es es_AR et eu fa fi fil fo fr fr_CA frp fur fy ga gd gl gu ha he hi hr hsb hu hy ia id ie ig is it ja jv ka kab kk km kn ko ksw ku ky la li lmo lo lt lv mai mg mi mk ml mn mo mr ms my nap nb nds ne nl nn no nso oc om or pa pap pl ps pt pt_BR qu ro ru rue rw sa sc sco shn si sk sl so sq sr sr@ijekavian sr@ijekavianlatin sr@latin sv sw szl ta te tg th tk tl tlh tpi tr ts tt ug uk ur uz uz@cyrillic vi wa xh yi yo zgh zh_CN zh_HK zh_TW zu"
+PLOCALES="aa af am an ar ary as ast ay az be be@latin ber bg bn bn_IN br bs ca ca@valencia crh cs csb cy da de dz el en@shaw en_AU en_CA en_GB en_IE en_NZ en_ZA eo es es_AR et eu fa fi fil fo fr fr_CA frp fur fy ga gd gl gu ha he hi hr hsb hu hy ia id ie ig is it ja jv ka kab kk km kn ko ksw ku ky la li lmo lo lt lv mai mg mi mk ml mn mnw mo mr ms my nap nb nds ne nl nn no nso oc om or pa pap pl ps pt pt_BR qu ro ru rue rw sa sc sco shn si sk sl so sq sr sr@ijekavian sr@ijekavianlatin sr@latin sv sw szl ta te tg th tk tl tlh tpi tr ts tt ug uk ur uz uz@cyrillic vi wa xh yi yo zgh zh_CN zh_HK zh_TW zu"
 
 inherit plocale
 
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/linuxmint/cinnamon-translations/archive/${PV}.tar.gz
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
 
 BDEPEND="sys-devel/gettext"
 
diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest
index 8134f9d79c86..f56d9c40a134 100644
--- a/gnome-extra/cinnamon/Manifest
+++ b/gnome-extra/cinnamon/Manifest
@@ -2,8 +2,8 @@ AUX cinnamon-3.6.6-wheel-sudo.patch 1342 BLAKE2B 173bb9331b51cd0a3110477c8631bd2
 AUX cinnamon-3.8.0-gnome-background-compatibility.patch 1069 BLAKE2B 4908d36ef03e202b76956c96df2dea7f2401d03c3c679ce19ec7e6ad046abf0fa1f1715ee94194a370605454dd3f3a777493c9cad9a88a3878093cda96b77b39 SHA512 a8b810f0aafab57984e8189bcc827e72dad7b9201ff88b36948b701cddb61c3bf003aa7b1986ad3ea526242800cbd183890218471fde7e7d7d2b9550b6688dcc
 AUX cinnamon-pillow-10-support.patch 3623 BLAKE2B edda19561231da485ef4f3ce018c8ca790c1c63b95649321c2d3c73ea31aecc173f6015a41348b4914fc61006d579ea19d33d55b67d8f12e5bbd386c892f8521 SHA512 c72141d60e93a1e6797eb92ca65a0cd93ee7b51230ee9c847f8fa335848c639d3d1f8917011982cac0fa1ac21a6e7bca3046e7125b5ea53bd3af708e62e7b59f
 AUX polkit-cinnamon-authentication-agent-1.desktop 252 BLAKE2B 8a7c10fa19e19c479ab40e9599b8804bc42a78548b9a09f34edc497dc5c9cbcd6958dbbb93cede57c0bf7938cc22f49c229274941b9509ad220e8790ed26bf9e SHA512 7857dc3d08129c37c461b85049d3a12b6602853d7dc44e68d79ce28bbe1121051a2061a4a4de050402230f85755d2800143e3373708fa19d43a001f7f1100360
-DIST cinnamon-5.6.8.tar.gz 2483519 BLAKE2B 0876bf097bbdb2b15b543a09d7d659995624d880a4c32a0d6bf580def4a72d33363c03525cd8072a238c624382c20bb66ce5ad5c05f8c21bbe5c06742209ca2b SHA512 33f7766f8d5df070cca7d4001be6a01dcb5cc57e60a320b0b2d14968af7bc0060575284f885de640ebe9297ea2bf9a6b97cb32dfb50fac37bb6d851d5f5d2237
 DIST cinnamon-5.8.4.tar.gz 2517117 BLAKE2B 4c3f452480b9e3ce7713221f1b76c475204b8dc1bb34d42a8faf492b0ca86416bb2fbd3849a7f048fef672ecf4613f06c645ec548159b6c3662b7602142e75e6 SHA512 2eaa253cdd01f00cca05ed123db59fde27f84cc24d7b8a3ec751a5f8252642870cbece941d1101f31fe0db43c15d9779bbdcacbf7037757569a4d17205cb10ad
-EBUILD cinnamon-5.6.8.ebuild 5293 BLAKE2B 7f1860b81ebebb5b2350ebe45d125bfb34652620f3fd6de050fdb5ecd28c10201431e5d6e1d2772bb8407778bac0f7f6250cd63d9b2a84941c274e1844b03297 SHA512 44fea6e75f6dc71a76a5ace0339afe33e45068f0f5a7636ac499e8d83f6b74ed4262a3016c41caedc29dcbcfdbcef73efcb6d5c9c18c70dbce893866c343509e
+DIST cinnamon-6.0.4.tar.gz 2538844 BLAKE2B de67c2e465d04dd4ed269172b4b58cfe0391446466e32e15410b5a847248566c075823d0a2fb87d7a693033b3e4e1fc21a18c7b9f45dca89ce8968a0be71eaba SHA512 357dd44f40b195a4a3ca3e88c5c9e55f1c06d36b4cec812a001c54ffb784b0d67bb9f41c1ae74fec590184b3480c9cd21ae54f7ee01e31f80eab0297b0d18a9c
 EBUILD cinnamon-5.8.4.ebuild 5427 BLAKE2B a4ba890d9f120f4afd0e6b8462566c8031829bff8582a723f2db31004c30a2c25213155e9b84edf6a6539f683ef87186fbca98a11bad7be83598751287b743fe SHA512 ebbd44078954d159000edf275794a5b657f92dbf6e7120b754d6ce0f843735660830eb2d9af78ad5959d1c6c4b8e5b125dbac889e9180d8e60fba535fe273b51
-MISC metadata.xml 488 BLAKE2B 422b0fe2eb6afbe708925e9fb6fa7f038497b11d51e06165e69e43515a27cf4a77c74a1a10156bbcfd6084704bbfa7f24d4e8a8409970c5d365aa6ba80ab5bd8 SHA512 5952deb426e8adcceb83a9bcaf94bbe96e4f065fbdfd6fa17b08988989f79c3f1de55e58ca13a26a6146b5cef90d8e3853d614d390c7afe0d2494d78ea3df744
+EBUILD cinnamon-6.0.4.ebuild 5947 BLAKE2B d56e4da1055e9af5cf0ebb6b7e9de58d255333e288b77892b761f1cb591dd5d56d2328549ca2454413b9e630d9def05f5e8d9157b89376b6b55e446aa0613f1d SHA512 a8bf69e3d02379ab3d6a9a4e795319e1081e84801177b6229778572ad852a4d515bb94badcd7a76ab44d2359b5f09a835db9f8979cf07ad4f857449b54937a97
+MISC metadata.xml 622 BLAKE2B 10b394cc9a24ba5609b2184c8d31439ae3e172055dba8d283c7bdf834ac715053c3533db0bce7f27d55b69a4891622b9cc21dcacdc0b797146e4144fc87d6b2e SHA512 f079066f4181bc467259651de9c83cedc0bbc4f0e817dac5ce081248001c23d4374ea393482400ffefae7edbb03fd61da87f114d6f4f65145200e156d0e9cc46
diff --git a/gnome-extra/cinnamon/cinnamon-5.6.8.ebuild b/gnome-extra/cinnamon/cinnamon-6.0.4.ebuild
index 512524a26469..1c2639ba7d27 100644
--- a/gnome-extra/cinnamon/cinnamon-5.6.8.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-6.0.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 PYTHON_REQ_USE="xml(+)"
 
 inherit meson gnome2-utils pax-utils python-single-r1 xdg
@@ -14,9 +14,9 @@ SRC_URI="https://github.com/linuxmint/cinnamon/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="BSD GPL-2+ GPL-3+ GPL-3-with-openssl-exception LGPL-2+ LGPL-2.1 LGPL-2.1+ MIT"
 SLOT="0"
-IUSE="+eds +gstreamer gtk-doc +nls +networkmanager"
+IUSE="+desktop-portal +eds +gstreamer gtk-doc +nls +networkmanager wayland"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-KEYWORDS="amd64 ~arm64 ~riscv x86"
+KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
 
 DEPEND="
 	${PYTHON_DEPS}
@@ -24,21 +24,21 @@ DEPEND="
 	>=dev-libs/glib-2.52.0:2[dbus]
 	>=dev-libs/gobject-introspection-1.29.15:=
 	dev-libs/libxml2:2
-	>=gnome-extra/cinnamon-desktop-5.6:0=
-	>=gnome-extra/cinnamon-menus-5.6
-	>=gnome-extra/cjs-5.6[cairo]
+	>=gnome-extra/cinnamon-desktop-6.0:0=
+	>=gnome-extra/cinnamon-menus-6.0
+	>=gnome-extra/cjs-6.0[cairo]
 	sys-apps/dbus
 	>=sys-auth/polkit-0.100[introspection]
 	virtual/opengl
 	x11-libs/cairo
 	x11-libs/gdk-pixbuf:2[introspection]
-	>=x11-libs/gtk+-3.12.0:3[introspection]
+	>=x11-libs/gtk+-3.12.0:3[introspection,wayland?]
 	>=x11-libs/libnotify-0.7.3:0=[introspection]
 	x11-libs/libX11
 	>=x11-libs/libXfixes-5.0
 	x11-libs/pango[introspection]
-	>=x11-libs/xapp-2.4.1[introspection]
-	>=x11-wm/muffin-5.6[introspection]
+	>=x11-libs/xapp-2.8.2[introspection]
+	>=x11-wm/muffin-6.0[introspection,wayland?]
 
 	eds? (
 		gnome-extra/evolution-data-server
@@ -72,19 +72,19 @@ RDEPEND="
 		dev-python/requests[${PYTHON_USEDEP}]
 		dev-python/setproctitle[${PYTHON_USEDEP}]
 		dev-python/tinycss2[${PYTHON_USEDEP}]
-		>=dev-python/python3-xapp-2.4.0[${PYTHON_USEDEP}]
+		>=dev-python/python3-xapp-2.4.1-r2[${PYTHON_USEDEP}]
 	')
 	>=gnome-base/dconf-0.4.1
 	>=gnome-base/gsettings-desktop-schemas-2.91.91
 	>=gnome-base/libgnomekbd-2.91.4
-	>=gnome-extra/cinnamon-control-center-5.6[networkmanager=]
-	>=gnome-extra/cinnamon-screensaver-5.6
-	>=gnome-extra/cinnamon-session-5.6
-	>=gnome-extra/cinnamon-settings-daemon-5.6
-	>=gnome-extra/nemo-5.6
+	>=gnome-extra/cinnamon-control-center-6.0[networkmanager=,wayland?]
+	>=gnome-extra/cinnamon-screensaver-6.0
+	>=gnome-extra/cinnamon-session-6.0
+	>=gnome-extra/cinnamon-settings-daemon-6.0[wayland?]
+	>=gnome-extra/nemo-6.0[wayland?]
 	gnome-extra/polkit-gnome
 	media-libs/gsound
-	net-libs/libsoup:2.4[introspection]
+	net-libs/libsoup:3.0[introspection]
 	net-misc/wget
 	sys-apps/accountsservice[introspection]
 	sys-apps/coreutils
@@ -95,8 +95,12 @@ RDEPEND="
 	x11-themes/adwaita-icon-theme
 	x11-themes/gnome-themes-standard
 
+	desktop-portal? (
+		sys-apps/xdg-desktop-portal-gtk
+		sys-apps/xdg-desktop-portal-xapp
+	)
 	nls? (
-		>=gnome-extra/cinnamon-translations-5.6
+		>=gnome-extra/cinnamon-translations-6.0
 	)
 "
 BDEPEND="
@@ -129,6 +133,18 @@ src_prepare() {
 	for p in $(grep -rl '#!.*python3' || die); do
 		python_fix_shebang "${p}"
 	done
+
+	if ! use desktop-portal; then
+		sed -i "s/subdir('xdg-portal')/#&/" data/meson.build || die
+	fi
+
+	if ! use wayland; then
+		sed -i "s/, 'cinnamon-wayland.session'//" meson.build || die
+		sed -i "s/'cinnamon-wayland.desktop',//" data/meson.build || die
+		sed -i "s/subdir('wayland_sessions')/#&/" data/meson.build || die
+		sed -i "s/exec cinnamon-session --session cinnamon-wayland/echo 'wayland support disabled'; exit 1/" \
+			files/usr/bin/cinnamon-session-cinnamon || die
+	fi
 }
 
 src_configure() {
diff --git a/gnome-extra/cinnamon/metadata.xml b/gnome-extra/cinnamon/metadata.xml
index 10688cfbc38d..24e82c1c597d 100644
--- a/gnome-extra/cinnamon/metadata.xml
+++ b/gnome-extra/cinnamon/metadata.xml
@@ -12,4 +12,7 @@
 	<upstream>
 		<remote-id type="github">linuxmint/Cinnamon</remote-id>
 	</upstream>
+	<use>
+		<flag name="desktop-portal">Enable <pkg>sys-apps/xdg-desktop-portal</pkg> backend implementation for Cinnamon</flag>
+	</use>
 </pkgmetadata>
diff --git a/gnome-extra/cjs/Manifest b/gnome-extra/cjs/Manifest
index 419d50f8f60b..16faaff16283 100644
--- a/gnome-extra/cjs/Manifest
+++ b/gnome-extra/cjs/Manifest
@@ -1,4 +1,6 @@
 AUX cjs-5.8.0-move_have_gtk4_to_the_appropriate_place.patch 1417 BLAKE2B 203701b5535b338283b99aad63e3577d3abb295c005d2e2ac908e2f8abdb24e8f7b9ef311bcf35889a93804583f13ac65f1d9453111b5195320aab9442237b2e SHA512 e2f7ed4c5f15cec6a6a7d3303779a217716ca3d8fa5d3128f4e7e685c47284fd95b9e416d50b28ca34bd06a9c469ebb3f317db88526cdc2ba1088381871da9a4
 DIST cjs-5.8.0.tar.gz 877668 BLAKE2B e4c031631030c2a4221937d5ca04034163f70f21e6e5ff2d0ca15f31a7455e83ecb1f977c4c4fb9a57e58d266856f817446e53b86ee87460bedf5339e33461b6 SHA512 f43bda5810b90ceab24d096d884c65503b2d9b94f5c0a9e6082215a427df97fbec4a21ee3f2d4f22d98ac24a04af1dcd9064600ec191ccec96ae0869cc803a02
+DIST cjs-6.0.0.tar.gz 877404 BLAKE2B 4290f0801f715aab1387da2ce0724376912db8ff3ad16fa8ad7eff03538dfc53ecbff2b7df0e70e52d16295b23ce51024da735d0e618b995fd3d3dfe297f9e26 SHA512 4cb359bf817d22a727683fd451ad6bde19aff4409e9033a97ef9cb204b3bd4c5e86421d7c01a267c3b4d42feb9b3bc5effb6fd970b3baf733242868c09536d95
 EBUILD cjs-5.8.0.ebuild 2393 BLAKE2B ef37c491778c8821a03ffc88dd82914ca9721f12fb9ade0641eeaf8793a9d848e83011ce02e40e7c100f96bd919dfbd4b44a8ed1d058881e9a35d07c3aadd6b8 SHA512 760f674ec14ec6eab030ee38db457386af61e3dc23a9b1aa04c799170d4f786038c0ce2cfcfdebb3b392cd67ec187bbe164bca418014b378b2d1df47c7126c2c
+EBUILD cjs-6.0.0.ebuild 2310 BLAKE2B 0ffbfad44e3519203f57e3d47e7558723d0646f96f9ed2fc458bd277e08d733853af12195e144a13cd1c1d9d984d141e79643c6127a099a6668712e34220120f SHA512 ad5c489730b22728983e51d92814447b4266cf17025abae64a8fa40009a90c91ff9c227c409e690e0c5e7aa0fb5dc6d8a92db84067f57741e4b7a626d33e060d
 MISC metadata.xml 608 BLAKE2B 7cc55145357fc7b4b46e1a77f19570b60f5dc6207c81efc3b92adf7d5fdb025296d4e6b8b927f193ed7bd0a929274e61c9bdddad2371ca78a497b94fdbe87737 SHA512 672923005e936fd3d08367a8db65318f63217841e6f841623d469c21ce354724f6c2cea853ecca928280b21011d6aa0e133a7830841c9fa44dd8c36402b28066
diff --git a/gnome-extra/cjs/cjs-6.0.0.ebuild b/gnome-extra/cjs/cjs-6.0.0.ebuild
new file mode 100644
index 000000000000..ea5027ca2add
--- /dev/null
+++ b/gnome-extra/cjs/cjs-6.0.0.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit flag-o-matic meson pax-utils python-any-r1 virtualx
+
+DESCRIPTION="Linux Mint's fork of gjs for Cinnamon"
+HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cjs"
+SRC_URI="https://github.com/linuxmint/cjs/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD CC0-1.0 MIT MPL-2.0 || ( MPL-1.1 GPL-2+ LGPL-2.1+ )"
+SLOT="0"
+IUSE="+cairo examples readline sysprof test"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	dev-lang/spidermonkey:102
+	>=dev-libs/glib-2.66.0:2
+	>=dev-libs/gobject-introspection-1.71.0:=
+	>=dev-libs/libffi-3.3:0=
+
+	cairo? (
+		x11-libs/cairo[glib,svg(+),X]
+		x11-libs/libX11
+	)
+	readline? ( sys-libs/readline:0= )
+"
+DEPEND="
+	${RDEPEND}
+	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 )
+	test? (
+		sys-apps/dbus
+		x11-libs/gtk+:3[introspection]
+	)
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+	python_fix_shebang build
+}
+
+src_configure() {
+	append-cppflags -DG_DISABLE_CAST_CHECKS
+
+	# On musl, it's required that either gjs, pixman or gnome-shell to be built
+	# with a larger stack otherwise librsvg fails to render a particular SVG, as
+	# a result we fail to get gdm or gnome-shell running (greeted with a fail
+	# whale screen). The bug has been reported to librsvg. This is ideally just
+	# a temporary workaround until we understand what exactly needs a larger
+	# stack size, as it's not sufficient to do just librsvg.
+	#
+	# Please refer to:
+	# https://gitlab.gnome.org/GNOME/librsvg/-/issues/686
+	# https://gitlab.gnome.org/GNOME/librsvg/-/issues/874
+	#
+	# TODO: Find an actual fix instead of increasing the stack
+	use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152
+
+	local emesonargs=(
+		$(meson_feature cairo)
+		$(meson_feature readline)
+		$(meson_feature sysprof profiler)
+		-Dinstalled_tests=false
+		$(meson_use !test skip_dbus_tests)
+		$(meson_use !test skip_gtk_tests)
+	)
+	meson_src_configure
+}
+
+src_test() {
+	virtx meson_src_test
+}
+
+src_install() {
+	meson_src_install
+
+	if use examples; then
+		docinto examples
+		dodoc "${S}"/examples/*
+	fi
+
+	# Required for cjs-console to run correctly on PaX systems
+	pax-mark mr "${ED}/usr/bin/cjs-console"
+}
diff --git a/gnome-extra/nemo-fileroller/Manifest b/gnome-extra/nemo-fileroller/Manifest
index 0b6269b310fe..cc2df978e203 100644
--- a/gnome-extra/nemo-fileroller/Manifest
+++ b/gnome-extra/nemo-fileroller/Manifest
@@ -1,5 +1,5 @@
-DIST nemo-extensions-5.6.1.tar.gz 535363 BLAKE2B cde43f8d38073ea83ab8a5d44b9edbd4d517d7299682f23a7d88784853818a6c77a6680164a8a155f877b48954bb009c9cb5d410c213738c790a892801c5d897 SHA512 d8896baaf78ae79c2e4b886603e77dc5b8372c392f91f5c554e15d60a5abc5a06b8e62e1ca3481c3cd32913e7d90150f63e01fb4fa3c1c596a4de26d6ac5be04
 DIST nemo-fileroller-5.8.0.tar.gz 535979 BLAKE2B e43433d1ac720d9dfb5d190f3b8d4e5f482caaffa29bfb2249cb4f51fa76e911c9e14237b08970f7910b70c328e35047271ad7f21521ed49a98979489e98f72a SHA512 cc1015c0c4379a6ca6a9f23931da5e4e1429e13026965a95cab6ce3b52ca28c07bd5be343cdcef0d9c128ecdd27f2a04d9dc1fc47cf51ce7e5102124ccd0ce39
-EBUILD nemo-fileroller-5.6.1.ebuild 621 BLAKE2B d5396f54bb3ad6ec1cdd453df5150955fb9219126c1ee49696732fea1ac60b4e0b95d379c67b4f8513cb62639e0c8069402c83fa22e77f460f7a864b2082917b SHA512 4755718111a1103bd12c056f7d1f3456b9f4cd4499f836cd195f1f620849228fcf3492797a137308b15afeb8a14f889294130a5e783a6bf0e45e4ad83bedd671
+DIST nemo-fileroller-6.0.1.tar.gz 448422 BLAKE2B b4cf28839e9feecdc6716327e432c862c962c5a12bce79317096054a2be7beb2b932e5efd3f31241afed58bead533a085580999da8da3a08b97d76445fee0f8e SHA512 49b1bad2f1bcbd5f299ba9c0f4a1547e6297c5bfc49a959ad87cae6a50d8bb69a4b0e93c9b865e07299cadec71613920ea4f98efde1532d1e4e8ed264d88b8e4
 EBUILD nemo-fileroller-5.8.0.ebuild 574 BLAKE2B 71a0088af82cd89ad3757bc65e27708a0a3833b7537211fbebd58162307f7fe0c6a2ce878d3e2db2c7af296eb1aaa2af014f6944c15abf3928cf9f1298ad3bb0 SHA512 32d7214dfd33458ed6e8dbdcde7c97681b64ed8ac16ddc97ff529257dce3772406e38c72e77f37edf1ffe8915923283eacf01b04d6f71cbfe76dede643fb146b
+EBUILD nemo-fileroller-6.0.1.ebuild 576 BLAKE2B 5dec4b3e59a8cab852c0adb16490eb6aa899c28083af477a126ea448c81b691aeeddbd39be02cc213ea559dac1bd6aa85e8db91b78331129c5b598673d63c117 SHA512 567a4a1211b7f0cdfd58d269fcf75eed7e4a4ff14e1d51e40320bd2ad4e89d258a0d44680e03a6a7ee68d68ae08582f4e8db830042f6e2efc326e425ecaf3ee2
 MISC metadata.xml 495 BLAKE2B 448c4a1b019897c3d8098b970e31849035b0125b707ac744eb668f7d295c76de0f121235edd1e76dc931051ccee1a508897679845dadfea04baf3d832baac5a5 SHA512 c86fa92ffb7d82826c4188c1ac63131fce88b40f5b9e13e2ef3162b3c83cc2d7cb6968c0e3e894a93e685cac818b7284072c55a4e8114dd44636a4678c415702
diff --git a/gnome-extra/nemo-fileroller/nemo-fileroller-5.6.1.ebuild b/gnome-extra/nemo-fileroller/nemo-fileroller-6.0.1.ebuild
index 93f2ce95914c..2d6206f7b074 100644
--- a/gnome-extra/nemo-fileroller/nemo-fileroller-5.6.1.ebuild
+++ b/gnome-extra/nemo-fileroller/nemo-fileroller-6.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,14 +7,14 @@ inherit meson
 
 DESCRIPTION="Nemo file-roller integration"
 HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/nemo-extensions"
-SRC_URI="https://github.com/linuxmint/nemo-extensions/archive/nemo-fileroller-5.6.1.tar.gz -> nemo-extensions-5.6.1.tar.gz"
+SRC_URI="https://github.com/linuxmint/nemo-extensions/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 
 DEPEND="
-	>=dev-libs/glib-2.14.0
+	>=dev-libs/glib-2.14.0:2
 	>=gnome-extra/nemo-2.0.0
 "
 RDEPEND="
@@ -22,4 +22,4 @@ RDEPEND="
 	app-arch/file-roller
 "
 
-S="${WORKDIR}/nemo-extensions-nemo-fileroller-5.6.1/${PN}"
+S="${WORKDIR}/nemo-extensions-${PV}/${PN}"
diff --git a/gnome-extra/nemo/Manifest b/gnome-extra/nemo/Manifest
index 8e07e320d003..c324417a076e 100644
--- a/gnome-extra/nemo/Manifest
+++ b/gnome-extra/nemo/Manifest
@@ -1,6 +1,7 @@
 AUX nemo-5.0.3-use-detex.patch 252 BLAKE2B 24c27845065f64a58411a8d719fbc1ca41362001f08d469bc336f55601e49358c02ba3aba423c521a261955a5da9832d8ae2df49f3d372270e63256a45fafcda SHA512 142bd88c7843fa40fb30cab01f8f7dd23b2b5c338eae2ac5971c7e392f9f24a8a820ef4b17b1c4afea729cc85a66cb7ddb06ecd417ff6ad494118fe8d88f1498
-DIST nemo-5.6.5.tar.gz 1498469 BLAKE2B 1ead71e79170e977e21dd631f7875198b3aa411689bd59b9c64b50a3c3b02a396f2b1cbc1e1420bf242004a6a724b8498e7e0cdd2b48b9d5e54ed97d21331cba SHA512 b37181e419d5a9427931d29f2addf9faebca7d74d8b8337dc9cb62ebc3b8f8d9dcef978bc6fc9be65efc41bd2a153685849f10cac9e28ffb3ccb3a8dee5aa739
+AUX nemo-6.0.0-fix-optional-wayland.patch 2103 BLAKE2B ad99989113d7d65d586709f78f68dd28c016fb56c33465aa38c2282ac0ff57669efab45f5547b5b983554401b32fef472362ab9e12a66715c6a0c89a27f173da SHA512 0a32ba81d1c79e9a008a9480d3901a17e55af67a8043041adc9f77989999fdf6ece0c654eb8fb62cbda5ade9104f1d52990ca3f38686fe8483d08d8163d4b210
 DIST nemo-5.8.4.tar.gz 1506620 BLAKE2B 948735bf75df2a0f8be9f5ddb29a73d6bf5127a6d932325855976da21334feb2c905b1a26c0ef285c8317b7e42223de098505802b1dde7a5e6fc1f4942d11681 SHA512 b636d5bbaa18e9259f74f086ed55e528be8dcfabdddbcdb0e3c82e3b93d0aa1b77573319f83df1529f1c473cdabbcab7280baa4169b482b5b9ecf6ade6e04427
-EBUILD nemo-5.6.5.ebuild 3152 BLAKE2B b41b7db1fdb2fb96ac6856df07194ef30f0796a7af10a06af5ecc7be4fbf3dbd9655a8bea90f9f4712c6741bf134c2e38a9dcefa50cb9dfc8014f6f1294d5f1b SHA512 6e4ad752933ad78fc5d75c18c8af72fc6178a6a0f09b4a54e9e07f5cd5f532a1fcfc8fde6962288a78f38ee87d5333e5e968b758a158b1bcdc680854050175bb
+DIST nemo-6.0.2.tar.gz 1480887 BLAKE2B d1e3892938cb81bcb676626a9ef54362939d522a6d09befe25dd77a236a7eee3e06461da1855317bff2a5f201bc142903ce085bfbafdbddca0700a177221ccdf SHA512 05e8a6ab785f527ad61c1fe57d372ae8ea8f77d27ec8608d38e99f5f0f9065aecef4b84d1b016b682d14320d7099806d5672a101c0a370429d1c3f2a341fed1c
 EBUILD nemo-5.8.4.ebuild 3137 BLAKE2B 6d5cc7a56517cddd50b959ed39e40112e742ba4b48be34635d0c1504eb5070ef9901a57ab62cb1912d5af5d4d983ae355704e3fd7682d097a9271bf1a43dc8ea SHA512 448ce11da464b5c9c0edcde8707cdff6e323b3b1d47314a9bb11a7b2f7eb4f979351c8746d3e1762a21199c3199d13b707616ead9414a42976701f4a0cd9c21b
+EBUILD nemo-6.0.2.ebuild 3300 BLAKE2B ca13f502ec38f3b9620ca8c902ed1fa6a249d4d8e2f369c39f51c0b6dbaa3024bc30be22b755b0c7f5cc22a2e2de0f68e7ce3f932edf6e80548f0217f405825e SHA512 2916c9eaf741d1e64d5462058873b22572ef3ec14dac7478da1a61d806f39581672717533aefbcaf3044bc898ddcbc8ba7dfd81a647ecd87d5ccbf9e3dc9ddef
 MISC metadata.xml 580 BLAKE2B da0ac9cd13730b5c1727a6d0431f3289af829b77781baf4d3512c78139bca7b9a7d136563de8e2f5abf914520de8a5a092b1e0f2505558e5e61813fa5f9c09ad SHA512 d38cebfe673764a4a96d66a66afe55f6f04c74bf1d06d8fddc319a2eb9ed351b205e3a48c47bfeff7f3da85c89ad0512e11a420f82c228a548fc7553147b927e
diff --git a/gnome-extra/nemo/files/nemo-6.0.0-fix-optional-wayland.patch b/gnome-extra/nemo/files/nemo-6.0.0-fix-optional-wayland.patch
new file mode 100644
index 000000000000..559abbde0a47
--- /dev/null
+++ b/gnome-extra/nemo/files/nemo-6.0.0-fix-optional-wayland.patch
@@ -0,0 +1,61 @@
+From 1d74919f2657bdb0414d5bf631f6fb1207b261a9 Mon Sep 17 00:00:00 2001
+From: Sparky Bluefang <sparky@bluefang-logic.com>
+Date: Sun, 7 Jan 2024 18:14:22 -0500
+Subject: [PATCH] Make wayland dependency optional
+
+---
+ eel/eel-gtk-extensions.c | 5 ++++-
+ meson.build              | 2 +-
+ 2 files changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/eel/eel-gtk-extensions.c b/eel/eel-gtk-extensions.c
+index c4fcc942a..643a51726 100644
+--- a/eel/eel-gtk-extensions.c
++++ b/eel/eel-gtk-extensions.c
+@@ -38,7 +38,9 @@
+ #include <X11/Xatom.h>
+ #include <gdk/gdk.h>
+ #include <gdk/gdkprivate.h>
++#ifdef GDK_WINDOWING_WAYLAND
+ #include <gdk/gdkwayland.h>
++#endif
+ #include <gtk/gtk.h>
+ #include <glib/gi18n-lib.h>
+ #include <math.h>
+@@ -253,6 +255,7 @@ gboolean
+ eel_check_is_wayland (void)
+ {
+     static gboolean using_wayland = FALSE;
++#ifdef GDK_WINDOWING_WAYLAND
+     static gsize once_init = 0;
+ 
+     if (g_once_init_enter (&once_init)) {
+@@ -260,7 +263,7 @@ eel_check_is_wayland (void)
+ 
+         g_once_init_leave (&once_init, 1);
+     }
+-
++#endif
+     return using_wayland;
+ }
+ 
+diff --git a/meson.build b/meson.build
+index bba97ee31..998229620 100644
+--- a/meson.build
++++ b/meson.build
+@@ -72,7 +72,6 @@ glib_version = '>=2.45.7'
+ math    = cc.find_library('m', required: true)
+ 
+ gtk     = dependency('gtk+-3.0',                    version: '>=3.10.0')
+-gtk_wl  = dependency('gtk+-wayland-3.0',            version: '>=3.10.0')
+ gio     = dependency('gio-2.0',                     version: glib_version)
+ gio_unix= dependency('gio-unix-2.0',                version: glib_version)
+ glib    = dependency('glib-2.0',                    version: glib_version)
+@@ -201,6 +200,7 @@ message('\n'.join(['',
+ '    libexif support:        @0@'.format(libexif_enabled),
+ '    exempi  support:        @0@'.format(exempi_enabled),
+ '    Tracker support:        @0@'.format(tracker_enabled),
++'    Wayland support:        @0@'.format(cc.has_header('gdk/gdkwayland.h', dependencies: gtk)),
+ '',
+ '    nemo-extension documentation: @0@'.format(gtkdoc_enabled),
+ '    nemo-extension introspection: @0@'.format(true),
diff --git a/gnome-extra/nemo/nemo-5.6.5.ebuild b/gnome-extra/nemo/nemo-6.0.2.ebuild
index 3e20d3f28c70..089f473515e5 100644
--- a/gnome-extra/nemo/nemo-5.6.5.ebuild
+++ b/gnome-extra/nemo/nemo-6.0.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit meson gnome2-utils python-single-r1 readme.gentoo-r1 virtualx xdg
 
@@ -13,8 +13,8 @@ SRC_URI="https://github.com/linuxmint/nemo/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+ LGPL-2+ LGPL-2.1+ FDL-1.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
-IUSE="exif gtk-doc +nls selinux test xmp"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="exif gtk-doc +nls selinux test tracker wayland xmp"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 # https://github.com/linuxmint/nemo/issues/2501
@@ -26,18 +26,27 @@ COMMON_DEPEND="
 	>=dev-libs/glib-2.45.7:2[dbus]
 	>=dev-libs/gobject-introspection-0.9.12:=
 	>=dev-libs/libxml2-2.7.8:2
-	>=gnome-extra/cinnamon-desktop-5.6:0=
+	>=gnome-extra/cinnamon-desktop-6.0:0=
 	gnome-extra/libgsf:=
 	x11-libs/cairo
 	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.10.0:3[introspection]
+	>=x11-libs/gtk+-3.10.0:3[introspection,wayland=]
 	x11-libs/libX11
 	>=x11-libs/pango-1.40.0
-	>=x11-libs/xapp-2.4.1
+	>=x11-libs/xapp-2.8.2
 
-	exif? ( >=media-libs/libexif-0.6.20 )
-	selinux? ( sys-libs/libselinux )
-	xmp? ( >=media-libs/exempi-2.2.0:= )
+	exif? (
+		>=media-libs/libexif-0.6.20
+	)
+	selinux? (
+		sys-libs/libselinux
+	)
+	tracker? (
+		app-misc/tracker:3
+	)
+	xmp? (
+		>=media-libs/exempi-2.2.0:=
+	)
 "
 RDEPEND="
 	${COMMON_DEPEND}
@@ -46,7 +55,9 @@ RDEPEND="
 	')
 	x11-themes/adwaita-icon-theme
 
-	nls? ( >=gnome-extra/cinnamon-translations-5.6 )
+	nls? (
+		>=gnome-extra/cinnamon-translations-6.0
+	)
 "
 PDEPEND="
 	>=gnome-base/gvfs-0.1.2
@@ -61,12 +72,18 @@ BDEPEND="
 	sys-devel/gettext
 	virtual/pkgconfig
 
-	gtk-doc? ( dev-util/gtk-doc )
+	gtk-doc? (
+		dev-util/gtk-doc
+	)
 "
 
 PATCHES=(
 	# Undo the switch to untex as it's not packaged.
 	"${FILESDIR}/${PN}-5.0.3-use-detex.patch"
+
+	# Fix optional wayland
+	# https://github.com/linuxmint/nemo/pull/3347
+	"${FILESDIR}/${PN}-6.0.0-fix-optional-wayland.patch"
 )
 
 DISABLE_AUTOFORMATTING="yes"
@@ -98,14 +115,12 @@ src_prepare() {
 }
 
 src_configure() {
-	# tracker: only supports unmaintained tracker-2, not >=tracker-3.
 	local emesonargs=(
 		$(meson_use exif)
 		$(meson_use xmp)
 		$(meson_use selinux)
+		$(meson_use tracker)
 		$(meson_use gtk-doc gtk_doc)
-
-		-Dtracker=false
 	)
 	meson_src_configure
 }