gentoo auto-resync : 28:09:2024 - 01:25:57

32 files changed, 9 insertions, 1517 deletions

diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index 8617410a09d3..067cb806e15f 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 7c958266aa33..b581784b1444 100644
--- a/gnome-extra/cinnamon-control-center/Manifest
+++ b/gnome-extra/cinnamon-control-center/Manifest
@@ -1,7 +1,3 @@
-AUX cinnamon-control-center-6.0.0-c99.patch 1079 BLAKE2B 4ae36ae3b5810ed6e08964883519510e608153133544ab4c23ff7aefc3bca19d5a651eeaa92adb336719e788709ee8c888c5b5c6a53719f7132154f0521c1e06 SHA512 3eedfb9f393a6187f8cec18ad17191e3908700a8d85770bce57ad318410f341ce2dcace452df06b4a48d6c68b8026d0f0c683748f7315c7a04179f93bdb04753
-AUX cinnamon-control-center-6.0.0-fix-optional-wayland.patch 1702 BLAKE2B 442a793bc3574a2fea9ea1f4b3cdbaa1fd78a74baec80b6ff6d2d35e0ca0e3c7eb4981490347e645e7fa4cabffdaecd5faa0076d31df6cfd3fac51ba42d20c73 SHA512 eb4395fa7e8a5822ea62068ddde0eb118d747dbbe54228fa015dc97ca6d8f041ab64095a1bc42114d82d775fc1bf569708b8e027034a95aa2ab01e99993fe552
-DIST cinnamon-control-center-6.0.0.tar.gz 3821056 BLAKE2B b856e4c258a76aa5e558cca53ac333df81ae135d731a5de65470282e741a95f2c179fbd9f28e8bb26824de5ee1f9b9fcb0143fee1760800149a345085c45f11b SHA512 e49b72590418da63c6db9c4224e6a32f9014bf4a4810e3a89babaa21d211ade135912e7be1a356c57328d85774517e0f696c724e62b2d3581c5f73c8a88cf486
 DIST cinnamon-control-center-6.2.0.tar.gz 3813695 BLAKE2B 4ddc97e600b2643ee16477165171f5251f7004d53524a77ec5d363717b84cec61c5bd83334a6dbb261d6ef40bd927fcdf6ef779953ad549881871f2f0e70471e SHA512 815158d057267956470d858cfb62e527c3655adce08e1f9b928f3d8b8b43ffc15d04ab1b11d5603dc75e7347925067e9627cc199f0328ccacd0421112de3b7b4
-EBUILD cinnamon-control-center-6.0.0-r1.ebuild 2726 BLAKE2B 33a29f9ec4a878db87a52b7bd9e04e26d4afafd888a9ebb57855f2f610e9b976def94ddaa51668eb551c38ae82680e6695f7f7705747c5fd9beac2f60724a63d SHA512 075972736cb7292584c47a6a329d864244bb9f60cd46e215e23f308a7296b52c51501f7dbeb5e352cd4c9b3fc0d28d932f46e1e7e295ccca888db61b3160a1a5
 EBUILD cinnamon-control-center-6.2.0-r1.ebuild 2493 BLAKE2B b42c32b8ed5845f147f61572c77941d396b264f90a0d42295dcc9e86d1dfaf83ee8929a55b7f18a812a5fd3b2904e0cd8e8475a5774c82822f15415c5ea0eb03 SHA512 faed8129d0f224a6e670a7c481f9ce614b8af31b740c090fd401f3199961cda8b697134771c06a52e3cc3e6122714efd69f40c151c514a12ea881f31e0d90ae5
-MISC metadata.xml 762 BLAKE2B 5a4411060287e76154bd0727feae76a45e8992077d7cbc6d1ad102d933246d98b3349bf0dc516f35d538e6c1d4a5d427e1561b646b628d408a5743666f5f2ca7 SHA512 c03709d9a1c8d678ce0957d08516e49f8affa6be2153f30607c0f1be7c29a1e00f4955f2112e82dc7c3b3e410a6dabf5ba2bdd9f3141b6a5299068598decd0c3
+MISC metadata.xml 636 BLAKE2B 3543b9f4de724681047e9e484ea25a16473bd38c0e3902395741377bc939485a00363939a61b1a785bdc365d90f11103904393a92cbac43d553e6c1b45d00fea SHA512 d346eeeffe9fba1bd5370d39e3949cad00992116e8bb865ba0c220aa8efc370a9afc1b3e9052fa49b2ad0ac63c92ed36b99b734fda7779a10e402cacb39fd8b9
diff --git a/gnome-extra/cinnamon-control-center/cinnamon-control-center-6.0.0-r1.ebuild b/gnome-extra/cinnamon-control-center/cinnamon-control-center-6.0.0-r1.ebuild
deleted file mode 100644
index 26f3280b8412..000000000000
--- a/gnome-extra/cinnamon-control-center/cinnamon-control-center-6.0.0-r1.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit meson gnome2-utils python-any-r1 xdg virtualx
-
-DESCRIPTION="Cinnamons's main interface to configure various aspects of the desktop"
-HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon-control-center"
-SRC_URI="https://github.com/linuxmint/cinnamon-control-center/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+ LGPL-2+ LGPL-2.1+ MIT"
-SLOT="0"
-IUSE="+colord input_devices_wacom +networkmanager +modemmanager gnome-online-accounts systemd test wayland"
-REQUIRED_USE="modemmanager? ( networkmanager )"
-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-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[wayland=]
-	>=dev-libs/libgudev-232
-	>=x11-libs/libnotify-0.7.3
-	x11-libs/cairo
-	x11-libs/libX11
-	>=x11-libs/libxklavier-5.1:=
-	x11-libs/pango
-
-	colord? (
-		>=x11-misc/colord-0.1.14:0=
-	)
-	input_devices_wacom? (
-		>=dev-libs/libwacom-0.7:=
-		>=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:=
-		)
-	)
-	gnome-online-accounts? (
-		>=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
-	)
-"
-DEPEND="
-	${COMMON_DEPEND}
-	app-text/iso-codes
-	x11-base/xorg-proto
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	# Fix optional wayland
-	# https://github.com/linuxmint/cinnamon-control-center/pull/323
-	"${FILESDIR}/${PN}-6.0.0-fix-optional-wayland.patch"
-	"${FILESDIR}/${PN}-6.0.0-c99.patch"
-)
-
-src_prepare() {
-	default
-	python_fix_shebang meson_install_schemas.py
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use colord color)
-		$(meson_use modemmanager)
-		$(meson_use networkmanager)
-		$(meson_use gnome-online-accounts onlineaccounts)
-		$(meson_use input_devices_wacom wacom)
-	)
-	meson_src_configure
-}
-
-src_test() {
-	virtx meson_src_test
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-6.0.0-c99.patch b/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-6.0.0-c99.patch
deleted file mode 100644
index b5a73ae3186d..000000000000
--- a/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-6.0.0-c99.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-https://bugs.gentoo.org/919085
-https://github.com/linuxmint/cinnamon-control-center/commit/0361ff2974eb4741f3cd8b6db00dbe1ab56c8a59
-
-From 0361ff2974eb4741f3cd8b6db00dbe1ab56c8a59 Mon Sep 17 00:00:00 2001
-From: Leigh Scott <leigh123linux@gmail.com>
-Date: Thu, 18 Jan 2024 21:30:28 +0000
-Subject: [PATCH] network: Fix warning about missing cast to GtkWidget* (#324)
-
-Based on https://github.com/GNOME/gnome-control-center/commit/167d11e2107e46b4621cf6fc370c5b191b4b7732
---- a/panels/network/connection-editor/net-connection-editor.c
-+++ b/panels/network/connection-editor/net-connection-editor.c
-@@ -845,7 +845,7 @@ net_connection_editor_new (GtkWindow        *parent_window,
-         editor = g_object_new (NET_TYPE_CONNECTION_EDITOR, NULL);
- 
-         if (parent_window) {
--                editor->parent_window = g_object_ref (parent_window);
-+                editor->parent_window = GTK_WIDGET (g_object_ref (parent_window));
-                 gtk_window_set_transient_for (GTK_WINDOW (editor->window),
-                                               parent_window);
-         }
-
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
deleted file mode 100644
index 2aab3af02146..000000000000
--- a/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-6.0.0-fix-optional-wayland.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-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-control-center/metadata.xml b/gnome-extra/cinnamon-control-center/metadata.xml
index 05d588225e68..10edebb3fffb 100644
--- a/gnome-extra/cinnamon-control-center/metadata.xml
+++ b/gnome-extra/cinnamon-control-center/metadata.xml
@@ -13,7 +13,6 @@
 		<remote-id type="github">linuxmint/cinnamon-control-center</remote-id>
 	</upstream>
 	<use>
-		<flag name="gnome-online-accounts">Enable configuration panel for <pkg>net-libs/gnome-online-accounts</pkg> accounts</flag>
 		<flag name="modemmanager">Enable support for mobile broadband devices using <pkg>net-misc/modemmanager</pkg></flag>
 	</use>
 </pkgmetadata>
diff --git a/gnome-extra/cinnamon-desktop/Manifest b/gnome-extra/cinnamon-desktop/Manifest
index 091fe932c141..139b8361fa36 100644
--- a/gnome-extra/cinnamon-desktop/Manifest
+++ b/gnome-extra/cinnamon-desktop/Manifest
@@ -1,6 +1,3 @@
-AUX cinnamon-desktop-6.0.0-fix-idle-monitor-dbus.patch 3463 BLAKE2B 2d52681a98eb18e8706934bea2922c3974b97b162d2c93c75bf18b3f040015614c4f440faf8554fe09df314084d5a44052502a1e4836a33f1999375923cd562d SHA512 faed2bf7f43ee85dc302ffc8b42fdf95b20ab7f658ca921ced5999e7b798a91507ae56cf942f1245e850dd26c1755bb64a922a874b55c6eca0aeaad2d5f6be74
-DIST cinnamon-desktop-6.0.0.tar.gz 509871 BLAKE2B 908b53445327cdbb5560655700e6dfa829934714167f02dda2d9d31a02ae85fcf6565704e791f67f0725e9eb76ed65ef26944d3fac2a58e3091b2afd10bb70af SHA512 35c09c6c3b9563c27561624bb731f17dd4f07b4e5aca5af39ffd56f72fa271babb4fd2cfe7080ac078b0d9141fcbc904036f3f156c547d64e68ba53eea14a471
 DIST cinnamon-desktop-6.2.0.tar.gz 510369 BLAKE2B e91cc5de64cfa2b936dd224727a493f7ca9049272d7cead88f6e6682b3e11505798d340e245816386e8427712dc3159c416bc51ac6b8cdf937649f34afa247f7 SHA512 be7e4fe206fb4fa62cacf7190b5702035313346ae51a3ef985ec2046d30e0ae5b1e1d314f82d362a363c3949deab02e4d2a4ea910ffe7f279111563c224f75f7
-EBUILD cinnamon-desktop-6.0.0.ebuild 1698 BLAKE2B a2d55330d04fe33619bd5b10ef90f7222931d75f57928e9977b917a2f57ae11fa3b3552e2e2c494e8ee50ed1d68f222c5b3b7778860a12debe42480d66405c99 SHA512 9ec7545a194e23ce0ea54577b8a48d651352a8a04691c301bbb1b4ec5e5d88cd49ab969853e25bae991733c900c27c5bdf82bd620260745460322cc9f3ddd07d
 EBUILD cinnamon-desktop-6.2.0.ebuild 1714 BLAKE2B 181ec00176e0f12f4335b401a7fc364f7260d2a8cb81c0294d0ef7c8e42b1250add6451d1374d2582e722b336a621ff7fd27ff8d0560d99136b74dc9e0ea88bb SHA512 9fbee55110211224626ff0cda9a63fd22762d4d5d9ba6429e8b6132f2e5141588b485b3ded3b3c9c3b5249ba09dda4c0f008887bacf55ae863811d38c1c0bfe9
 MISC metadata.xml 496 BLAKE2B c019ef51b10de9ccafed1294e6d436dcdc8f02735170afe9e038689c6c4d76fb3e099bc9ec7f10c2a50d2bfa5e1d1c191667a470d734effad53d9d299f431664 SHA512 41a99dd4e1aad85dda44e2168bc150e2c27bb40a45c0dfe0f085e502242e6a0704ad8b47f64140d81afa7ff096cac735c46827f3d949962400de92d769505cc4
diff --git a/gnome-extra/cinnamon-desktop/cinnamon-desktop-6.0.0.ebuild b/gnome-extra/cinnamon-desktop/cinnamon-desktop-6.0.0.ebuild
deleted file mode 100644
index dad0b54da90f..000000000000
--- a/gnome-extra/cinnamon-desktop/cinnamon-desktop-6.0.0.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit meson 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"
-SRC_URI="https://github.com/linuxmint/cinnamon-desktop/archive/${PV}.tar.gz -> ${P}.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="systemd"
-
-RDEPEND="
-	>=dev-libs/glib-2.37.3:2[dbus]
-	>=dev-libs/gobject-introspection-0.10.2:=
-	>=gnome-base/gsettings-desktop-schemas-3.5.91
-	>=media-libs/libpulse-12.99.3[glib]
-	sys-apps/accountsservice
-	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/libX11
-	>=x11-libs/libXext-1.1
-	x11-libs/libxkbfile
-	>=x11-libs/libXrandr-1.3
-	x11-misc/xkeyboard-config
-	systemd? (
-		sys-apps/systemd
-	)
-"
-DEPEND="
-	${RDEPEND}
-	x11-base/xorg-proto
-"
-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
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dpnp_ids="${EPREFIX}/usr/share/hwdata/pnp.ids"
-		$(meson_feature systemd)
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	gnome2_schemas_update
-}
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
deleted file mode 100644
index 76fa5c53cde6..000000000000
--- a/gnome-extra/cinnamon-desktop/files/cinnamon-desktop-6.0.0-fix-idle-monitor-dbus.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-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 2e0358f7f2e3..1b56109f8b54 100644
--- a/gnome-extra/cinnamon-menus/Manifest
+++ b/gnome-extra/cinnamon-menus/Manifest
@@ -1,5 +1,3 @@
-DIST cinnamon-menus-6.0.0.tar.gz 96411 BLAKE2B 08394d32e66a8e3e8f1e13a97128099c1fcfe868a52c6bdbdd9ad1c98508c441d8b354d37856dd645db8a9e8f33c3f1ad3c6033bd2f22ea33d7644594cc1559f SHA512 9b7e1f92ef451e80aebc95a2fdd0e94e352c634a09474878fb12cf0ba8a06e3b4ca522ab6b6c768b7b194cb262bad0bfd5b81557d77cb9075506de11d9de56a7
 DIST cinnamon-menus-6.2.0.tar.gz 96496 BLAKE2B 151ccc6baa1d3bda7269b71d0c9d28666553a4248d4bc1dded9f669d4fe33ac6c7785b84a7f8239636c9f84a21378843e22b40d20415e009b039b53ee3b677d2 SHA512 b7132a6cabd6f4ff0d5e247585029af18712a2cb220aba93e609ffb569b79cbaf72caf1d70d22dbae576c2634be092c430f702c3bb25d6fa2768aba98900e5b9
-EBUILD cinnamon-menus-6.0.0.ebuild 817 BLAKE2B 90f33c3971ed9a5f32b54805e73581690f02b3742ac7b742d3ddbf604183319caad17516cfee9a98682ee0a7e76996fd0017792c6950af22c6df3e00b91bf65f SHA512 b5f4a2be6dbb7bfe0f18c7388260f085220874c31ba625de858bc5a2a2344f45e7fd357e4b9deff85e5af5d422b721e23c0a95dae8a320afac76737e86ae79d3
 EBUILD cinnamon-menus-6.2.0.ebuild 817 BLAKE2B a7b6141b3fae6da8f39c9c467ac58975f95815215ab9b9b68e7ed858f562fb932eda3e9206d5f85f2dfc42ec3888e4e836d4907f985bfc4000c63556dc5c5c80 SHA512 7f3195eec0f6be7e147170a305392f30e93c5573137f0404949b108ded7e9780e64f2c6dd660ffbcb5ed6198468d476eb30b3989a1ca33fc380bf90d9cb8a496
 MISC metadata.xml 494 BLAKE2B a27fd494a680cb42a41c806166cf6ce2f2df3d132d62af9e4a4f8c7ae66ecc93b05afc64e250122cdd62bad428fc065984ab68e31c0d6c5be2a070a8dc912d7b SHA512 1fe1a31acf83ea9070318e76a6acb09969c7dac0779292822a7d1800ac7be4392a26091a59bceeb3ce84381d95159c9c2c1cdb30e567c2b2896a2a02564656ff
diff --git a/gnome-extra/cinnamon-menus/cinnamon-menus-6.0.0.ebuild b/gnome-extra/cinnamon-menus/cinnamon-menus-6.0.0.ebuild
deleted file mode 100644
index 9af1b5f92733..000000000000
--- a/gnome-extra/cinnamon-menus/cinnamon-menus-6.0.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson xdg
-
-DESCRIPTION="Cinnamon's library for the Desktop Menu fd.o specification"
-HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon-menus"
-SRC_URI="https://github.com/linuxmint/cinnamon-menus/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~loong ~ppc64 ~riscv x86"
-IUSE="gtk-doc"
-
-RDEPEND="
-	>=dev-libs/glib-2.29.15:2
-	>=dev-libs/gobject-introspection-1.58.3:=
-"
-DEPEND="
-	${RDEPEND}
-	dev-libs/gobject-introspection-common
-"
-BDEPEND="
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	gtk-doc? ( dev-util/gtk-doc )
-"
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use gtk-doc enable_docs)
-	)
-	meson_src_configure
-}
diff --git a/gnome-extra/cinnamon-screensaver/Manifest b/gnome-extra/cinnamon-screensaver/Manifest
index a49aa2551ff4..e11571196dfe 100644
--- a/gnome-extra/cinnamon-screensaver/Manifest
+++ b/gnome-extra/cinnamon-screensaver/Manifest
@@ -1,5 +1,5 @@
-DIST cinnamon-screensaver-6.0.3.tar.gz 161006 BLAKE2B 4f88cf0ca72384fbff2ce1f55047b6d53704bf55b2a3bfd5c942c19bcfbe9249c07e9fc1f08246c0e55c6b2110f543157ec87028789e58d752ff21d54d347ae2 SHA512 556b8eeac280001273460e5f1f5d1e5dbdf003ff95ad1ec9c3217316a6197520a32cd05d61a395daef066f13c8c9c89ebb9057779dd845bd597c207492fd91ef
 DIST cinnamon-screensaver-6.2.0.tar.gz 161045 BLAKE2B c0afe57912ed9cfc579defa4ea450c5ab79c0761f4babc9ad9c745d1c71c24ba9bcd77cd952d8e7c1ebd317025d3cf3bacc24c87e2757a94582337dc4645c814 SHA512 a7a6163be7de5fd7b58ed1aeb76610476f872f5372489a8ce724c92fa2a26ce418546ca9ae39a97dac9cf922ef13e5faf34bcbc087382db1e6fc50c02d6c8b21
-EBUILD cinnamon-screensaver-6.0.3.ebuild 1692 BLAKE2B b8d39801232be47a1ec007e33fed462a6d1c51f6e3e78e79927e1ad40dd2fe082f3efda7600bf59c4223c02f2ffefe7c022bf5dcad111d684e416a9accaf88a4 SHA512 5c2fd2be17d0af85100fa90dfccc77068d13461e47d85bede41fbe5e33cab9319d7e13d98a87b67555185e27cc15d68728a62b6bea3e4e475c24b15276ad7d4d
+DIST cinnamon-screensaver-6.2.1.tar.gz 161088 BLAKE2B 86159f06e44bd58ca443457109c1345ba3021d1b8aa339d315da45fad994e8fccf59fffdc8bef3edefebf42a6ea4ab632354ef5a8f7c10f6d4d70ab517fce3bb SHA512 4033d1170b4ef359dc8a6d529b40e40fa5bb630f4900eaf5d45c73d7caadde00345811bc5b8f347bfc184f16abbdb232ebf71bb911c713bb00ced557115fd300
 EBUILD cinnamon-screensaver-6.2.0.ebuild 1692 BLAKE2B b6ca63ad8ae70bb320ed7faaad3f6840d6fbbedcfe726145ba87f69f2776696fabea0313648f093f13203be02fd69b36ffd4827f6b3cb7a3d32623c22b00d67d SHA512 1bc0c12826cf1fcc57628338a85c0108a1fbeeee74e281aafb6e4cde5d29fa80f728d018129200fdcf44521f2c2958fce3dbf09fac04653c967ad69997ff92af
+EBUILD cinnamon-screensaver-6.2.1.ebuild 1694 BLAKE2B 9c8c1a3d26fb879ff7b62aa3d699f4048afab7397850b7031aec7c12d4d1a0d70b5fa172881614ed163b9c90201b1d2d57f20e7598aeaf35f77a3770292ee463 SHA512 5ef13a121f23408ee6da9ca9bb08647c439be577dae6fe8fb39994cbeb26b30ff2c89e58c6dc72fdbb5df561bdfa22a453c7891cc26545c78af2f9032a32b7ef
 MISC metadata.xml 500 BLAKE2B 92b85c1d68491b0e4f88203070760f1e8d2b51b3bf9d3615e18a26cdaf6466eadaa700f18f1668a9b214a540fe01639a49a8535cd43435ddba192fef0267ce98 SHA512 35fc95aac49117f0bd643ccd17d2e461ad1cc5dc744256f6cf83f4248c087b33f66eb4352aeae8105983789e7f8ca74727fc48557f462edfba658d411bb536f7
diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-6.0.3.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-6.2.1.ebuild
index 5e0bcc771c40..f5dfaf26eca7 100644
--- a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-6.0.3.ebuild
+++ b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-6.2.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 
 inherit meson python-single-r1 xdg
 
@@ -13,14 +13,14 @@ SRC_URI="https://github.com/linuxmint/cinnamon-screensaver/archive/${PV}.tar.gz
 
 LICENSE="GPL-2+ LGPL-2+ MIT"
 SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="systemd xinerama"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-KEYWORDS="amd64 ~arm64 ~loong ~ppc64 ~riscv x86"
 
 COMMON_DEPEND="
 	${PYTHON_DEPS}
 	>=dev-libs/glib-2.37.3:2[dbus]
-	>=gnome-extra/cinnamon-desktop-6.0
+	>=gnome-extra/cinnamon-desktop-6.2
 	sys-libs/pam
 	>=x11-libs/gtk+-3.22:3[introspection]
 	x11-libs/cairo
@@ -43,7 +43,7 @@ RDEPEND="
 		dev-python/psutil[${PYTHON_USEDEP}]
 		dev-python/pygobject:3[${PYTHON_USEDEP}]
 		dev-python/setproctitle[${PYTHON_USEDEP}]
-		>=dev-python/python3-xapp-2.4.1[${PYTHON_USEDEP}]
+		>=dev-python/python3-xapp-2.4.2[${PYTHON_USEDEP}]
 	')
 
 	systemd? ( >=sys-apps/systemd-31 )
diff --git a/gnome-extra/cinnamon-session/Manifest b/gnome-extra/cinnamon-session/Manifest
index 9be4fd694cc9..9e8a24bd5ad6 100644
--- a/gnome-extra/cinnamon-session/Manifest
+++ b/gnome-extra/cinnamon-session/Manifest
@@ -1,7 +1,3 @@
-AUX 0001-cs-presence.c-Fix-CsmPresence-idle-handling.patch 12035 BLAKE2B 7d0980553aa07cf310a1916743194742c906d8469ee0dc497b84332136c1674c243f39ae27ef988da32f1a9bc902275388325e4832f7c8afb255d4c8f469f4f5 SHA512 1c9afb2efabf45f3df61c6f8ad70a2bceb3eaa2d188cae0d7acf14693da9efc66e686691b4e1f9addf1b1f1b30ec640548e6faa4f3c3b55d2ce4c35c55deeb25
-AUX cinnamon-session-6.0.0-fix-optional-systemd.patch 605 BLAKE2B 29057363842f23a5b37583ab5d2cf312fbf31f9ef78b66e9b70980051771cc701f9e5b811d03d3534046c2cb76fda1751fc11b36cbcf90685b6fc05dd3773158 SHA512 7b89ef4d9915d50377c0ad10a1296a6bd5a11dbb2f30b2e2531aa817335776d08823b4a6401c0d4638f0d89674d91c3165aafa0b217dd488e7127e8fbc6ba9c6
-DIST cinnamon-session-6.0.4.tar.gz 165520 BLAKE2B fa608de433a4d47db102b1f11c716da8afeabd5772b7e957449297629e39bc215124acd2f0f94afe91763590ab92b06a3bce8dd1a6bad3997b9496b4114a36fa SHA512 cd8ac8579f9311f5234dad17fb32d40a1c58da2292734e58c4832d94a8b0687e4909f5886c2db0dab1e0c396f12c3495a8d966e76373ac26f3bd9795efcd1f1f
 DIST cinnamon-session-6.2.1.tar.gz 166106 BLAKE2B ef7bb345f6c32f5402d9ff5dca152455a861e41e4fc5a77d1184f75ef17b70ab78bd3cfc9f63265703153d86217b5cd0a679f50add722110c47f7246050ca68f SHA512 bc0e69b938920149c26e2470aab9c2290b3b7ecea8a6e8249683402eb07af0c3a88c42cb86723d422dd14442246e841469010a05e808e675ff0e7ff1cc834224
-EBUILD cinnamon-session-6.0.4.ebuild 1927 BLAKE2B ce124798c1d0cc8339ee5404778606a4f0ce5e2d27b83071b9f4543f5fc381d1f6d189c6f3affb5fb7d3c51a6b66badcdba6c50f6252d191b49c10bfb8783432 SHA512 e9ab0f98125e99072ae0454568aafab0c1453dbbc916759df955c35f32be9ed1309b1aed5b96bff04ebefe5f28953c68fe3f76bf7bc4e735bb567b875a2d2b15
 EBUILD cinnamon-session-6.2.1.ebuild 1674 BLAKE2B b5a63b87f44792b51d70f0496a6a3b3fcdecc22c46aea8ba185c30617b7d4489e159e8c8c7396e333e2ca3a5cf543aeaf481b334a11711e1e6a575cc81155aa1 SHA512 eae64d41ab69b5ad99e9046b787afb775948cb1ab1d06d7ddb7b05155d6c66afa01f1c023ffaf2b1b7823a78efc2723e58c2453842e740d5ea5cfe6f0ff02f0f
 MISC metadata.xml 496 BLAKE2B 3b3170a447d7818cdd93b3183feee36751832a07da741b16dfdfe029e09733f3ba94815312e6444b3421dd7bc3df9b4ca2f1c1ac2a5d83ae3881b1ab7cf809c0 SHA512 65d223bf44f83d8d2bda72791b362c4302ec813e9090331cf5ddc97e10ed610c1a91c6d467ff72d7e1430e7d70dcfa09f9c8e35c50a86130236798c80e19a2f2
diff --git a/gnome-extra/cinnamon-session/cinnamon-session-6.0.4.ebuild b/gnome-extra/cinnamon-session/cinnamon-session-6.0.4.ebuild
deleted file mode 100644
index a970f6adc9ce..000000000000
--- a/gnome-extra/cinnamon-session/cinnamon-session-6.0.4.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-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"
-SRC_URI="https://github.com/linuxmint/cinnamon-session/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-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[introspection]
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libXcomposite
-	x11-libs/libXext
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/pango[X]
-	>=x11-libs/xapp-2.8.1[introspection]
-
-	systemd? (
-		>=sys-apps/systemd-183
-	)
-	!systemd? (
-		sys-auth/elogind[policykit]
-	)
-"
-DEPEND="
-	${COMMON_DEPEND}
-	x11-libs/xtrans
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	${PYTHON_DEPS}
-	dev-libs/gobject-introspection
-	$(python_gen_cond_dep '
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-		dev-python/setproctitle[${PYTHON_USEDEP}]
-	')
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-util/gdbus-codegen
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	# Fix bad systemd include
-	# https://github.com/linuxmint/cinnamon-session/pull/164
-	"${FILESDIR}/${PN}-6.0.0-fix-optional-systemd.patch"
-	# fix crash on idle
-	"${FILESDIR}"/0001-cs-presence.c-Fix-CsmPresence-idle-handling.patch
-)
-
-src_prepare() {
-	default
-	python_fix_shebang data cinnamon-session-quit
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dipv6=true
-		-Dxtrans=true
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/cinnamon-session/files/0001-cs-presence.c-Fix-CsmPresence-idle-handling.patch b/gnome-extra/cinnamon-session/files/0001-cs-presence.c-Fix-CsmPresence-idle-handling.patch
deleted file mode 100644
index 01a194f7cb7b..000000000000
--- a/gnome-extra/cinnamon-session/files/0001-cs-presence.c-Fix-CsmPresence-idle-handling.patch
+++ /dev/null
@@ -1,303 +0,0 @@
-From 55e9291629cc028793e22b738214ecababe65c4b Mon Sep 17 00:00:00 2001
-From: Michael Webster <miketwebster@gmail.com>
-Date: Wed, 24 Jan 2024 09:14:01 -0500
-Subject: [PATCH] cs-presence.c: Fix CsmPresence idle handling.
-
-Idle detection was broken since 5.4, as gnome-idle-monitor (in
-libcinnamon-desktop) was looking for the wrong muffin interface
-names.
-
-This file was also adapted incompletely to the new idle-monitor
-API.
-
-requires:
-linuxmint/cinnamon-desktop@d0f8c74a7864786cf04
----
- cinnamon-session/csm-presence.c | 130 +++++++++++++++++++-------------
- cinnamon-session/csm-presence.h |   6 --
- 2 files changed, 77 insertions(+), 59 deletions(-)
-
-diff --git a/cinnamon-session/csm-presence.c b/cinnamon-session/csm-presence.c
-index 1fd3d7c..69da703 100644
---- a/cinnamon-session/csm-presence.c
-+++ b/cinnamon-session/csm-presence.c
-@@ -64,16 +64,12 @@ struct CsmPresencePrivate
- 
- enum {
-         PROP_0,
--        PROP_STATUS,
--        PROP_STATUS_TEXT,
-         PROP_IDLE_ENABLED,
-         PROP_IDLE_TIMEOUT,
- };
- 
--
- enum {
-         STATUS_CHANGED,
--        STATUS_TEXT_CHANGED,
-         LAST_SIGNAL
- };
- 
-@@ -99,6 +95,10 @@ csm_presence_error_quark (void)
-         return quark_volatile;
- }
- 
-+static void idle_became_active_cb (GnomeIdleMonitor *idle_monitor,
-+                                   guint             id,
-+                                   gpointer          user_data);
-+
- static gboolean
- csm_presence_set_status_text (CsmPresence  *presence,
-                               const char   *status_text,
-@@ -120,6 +120,8 @@ csm_presence_set_status_text (CsmPresence  *presence,
- 
-         if (status_text != NULL) {
-                 presence->priv->status_text = g_strdup (status_text);
-+        } else {
-+                presence->priv->status_text = g_strdup ("");
-         }
- 
-         csm_exported_presence_set_status_text (presence->priv->skeleton, presence->priv->status_text);
-@@ -128,11 +130,11 @@ csm_presence_set_status_text (CsmPresence  *presence,
-         return TRUE;
- }
- 
--static gboolean
-+static void
- csm_presence_set_status (CsmPresence  *presence,
-                          guint         status)
- {
--        g_return_val_if_fail (CSM_IS_PRESENCE (presence), FALSE);
-+        g_return_if_fail (CSM_IS_PRESENCE (presence));
- 
-         if (status != presence->priv->status) {
-                 presence->priv->status = status;
-@@ -140,7 +142,6 @@ csm_presence_set_status (CsmPresence  *presence,
-                 csm_exported_presence_emit_status_changed (presence->priv->skeleton, presence->priv->status);
-                 g_signal_emit (presence, signals[STATUS_CHANGED], 0, presence->priv->status);
-         }
--        return TRUE;
- }
- 
- static void
-@@ -158,6 +159,11 @@ set_session_idle (CsmPresence   *presence,
-                 /* save current status */
-                 presence->priv->saved_status = presence->priv->status;
-                 csm_presence_set_status (presence, CSM_PRESENCE_STATUS_IDLE);
-+
-+                gnome_idle_monitor_add_user_active_watch (presence->priv->idle_monitor,
-+                                                          idle_became_active_cb,
-+                                                          presence,
-+                                                          NULL);
-         } else {
-                 if (presence->priv->status != CSM_PRESENCE_STATUS_IDLE) {
-                         g_debug ("CsmPresence: already not idle, ignoring");
-@@ -171,27 +177,27 @@ set_session_idle (CsmPresence   *presence,
-         }
- }
- 
--static gboolean
--on_idle_timeout (GnomeIdleMonitor *monitor,
--                 guint             id,
--                 gboolean          condition,
--                 CsmPresence      *presence)
-+static void
-+idle_became_idle_cb (GnomeIdleMonitor *idle_monitor,
-+                     guint             id,
-+                     gpointer          user_data)
- {
--        gboolean handled;
--
--        handled = TRUE;
--        set_session_idle (presence, condition);
-+        CsmPresence *presence = user_data;
-+        set_session_idle (presence, TRUE);
-+}
- 
--        return handled;
-+static void
-+idle_became_active_cb (GnomeIdleMonitor *idle_monitor,
-+                       guint             id,
-+                       gpointer          user_data)
-+{
-+        CsmPresence *presence = user_data;
-+        set_session_idle (presence, FALSE);
- }
- 
- static void
- reset_idle_watch (CsmPresence  *presence)
- {
--        if (presence->priv->idle_monitor == NULL) {
--                return;
--        }
--
-         if (presence->priv->idle_watch_id > 0) {
-                 g_debug ("CsmPresence: removing idle watch (%i)", presence->priv->idle_watch_id);
-                 gnome_idle_monitor_remove_watch (presence->priv->idle_monitor,
-@@ -199,12 +205,11 @@ reset_idle_watch (CsmPresence  *presence)
-                 presence->priv->idle_watch_id = 0;
-         }
- 
--        if (! presence->priv->screensaver_active
--            && presence->priv->idle_enabled
-+        if (presence->priv->idle_enabled
-             && presence->priv->idle_timeout > 0) {
-                 presence->priv->idle_watch_id = gnome_idle_monitor_add_idle_watch (presence->priv->idle_monitor,
-                                                                                    presence->priv->idle_timeout,
--                                                                                   (GnomeIdleMonitorWatchFunc) on_idle_timeout,
-+                                                                                   idle_became_idle_cb,
-                                                                                    presence,
-                                                                                    NULL);
-                 g_debug ("CsmPresence: adding idle watch (%i) for %d secs",
-@@ -229,11 +234,36 @@ on_screensaver_g_signal (GDBusProxy  *proxy,
-         g_variant_get (parameters,
-                        "(b)", &is_active);
- 
--        g_debug ("screensaver status changed: %d", is_active);
-+        if (presence->priv->screensaver_active != is_active) {
-+                presence->priv->screensaver_active = is_active;
-+                set_session_idle (presence, is_active);
-+        }
-+}
-+
-+static void
-+screensaver_get_active_cb (GDBusProxy  *screensaver_proxy,
-+                           GAsyncResult *res,
-+                           CsmPresence *presence)
-+{
-+        g_autoptr(GVariant) data = NULL;
-+        g_autoptr(GError) error = NULL;
-+        gboolean is_active;
- 
-+        data = g_dbus_proxy_call_finish (screensaver_proxy, res, &error);
-+        if (!data) {
-+                if (error) {
-+                        g_warning ("Could not retrieve current screensaver active state: %s",
-+                                   error->message);
-+                } else {
-+                        g_warning ("Could not retrieve current screensaver active state!");
-+                }
-+
-+                return;
-+        }
-+
-+        g_variant_get (data, "(b)", &is_active);
-         if (presence->priv->screensaver_active != is_active) {
-                 presence->priv->screensaver_active = is_active;
--                reset_idle_watch (presence);
-                 set_session_idle (presence, is_active);
-         }
- }
-@@ -248,14 +278,25 @@ on_screensaver_name_owner_changed (GDBusProxy *proxy,
- 
-         presence = CSM_PRESENCE (user_data);
-         name_owner = g_dbus_proxy_get_name_owner (proxy);
-+        if (name_owner == NULL) {
-+                g_debug ("Detected that screensaver has left the bus");
- 
--        if (name_owner && g_strcmp0 (name_owner, CS_NAME)) {
--                g_warning ("Detected that screensaver has appeared on the bus");
--        } else {
--                g_warning ("Detected that screensaver has left the bus");
-+                presence->priv->screensaver_active = FALSE;
-                 set_session_idle (presence, FALSE);
--                reset_idle_watch (presence);
-+        } else {
-+                g_debug ("Detected that screensaver has aquired the bus");
-+
-+                g_dbus_proxy_call (presence->priv->screensaver_proxy,
-+                                   "GetActive",
-+                                   NULL,
-+                                   G_DBUS_CALL_FLAGS_NO_AUTO_START,
-+                                   1000,
-+                                   NULL,
-+                                   (GAsyncReadyCallback) screensaver_get_active_cb,
-+                                   presence);
-         }
-+
-+        g_free (name_owner);
- }
- 
- static gboolean
-@@ -352,7 +393,8 @@ csm_presence_constructor (GType                  type,
-         }
- 
-         presence->priv->screensaver_proxy = g_dbus_proxy_new_sync (presence->priv->connection,
--                                                                   G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START,
-+                                                                   G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START |
-+                                                                   G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
-                                                                    NULL,
-                                                                    CS_NAME,
-                                                                    CS_PATH,
-@@ -424,12 +466,6 @@ csm_presence_set_property (GObject       *object,
-         self = CSM_PRESENCE (object);
- 
-         switch (prop_id) {
--        case PROP_STATUS:
--                csm_presence_set_status (self, g_value_get_uint (value));
--                break;
--        case PROP_STATUS_TEXT:
--                csm_presence_set_status_text (self, g_value_get_string (value), NULL);
--                break;
-         case PROP_IDLE_ENABLED:
-                 csm_presence_set_idle_enabled (self, g_value_get_boolean (value));
-                 break;
-@@ -453,12 +489,6 @@ csm_presence_get_property (GObject    *object,
-         self = CSM_PRESENCE (object);
- 
-         switch (prop_id) {
--        case PROP_STATUS:
--                g_value_set_uint (value, self->priv->status);
--                break;
--        case PROP_STATUS_TEXT:
--                g_value_set_string (value, self->priv->status_text ? self->priv->status_text : "");
--                break;
-         case PROP_IDLE_ENABLED:
-                 g_value_set_boolean (value, self->priv->idle_enabled);
-                 break;
-@@ -482,15 +512,9 @@ csm_presence_finalize (GObject *object)
-                 presence->priv->idle_watch_id = 0;
-         }
- 
--        if (presence->priv->status_text != NULL) {
--                g_free (presence->priv->status_text);
--                presence->priv->status_text = NULL;
--        }
--
--        if (presence->priv->idle_monitor != NULL) {
--                g_object_unref (presence->priv->idle_monitor);
--                presence->priv->idle_monitor = NULL;
--        }
-+        g_clear_pointer (&presence->priv->status_text, g_free);
-+        g_clear_object (&presence->priv->idle_monitor);
-+        g_clear_object (&presence->priv->screensaver_proxy);
- 
-         G_OBJECT_CLASS (csm_presence_parent_class)->finalize (object);
- }
-diff --git a/cinnamon-session/csm-presence.h b/cinnamon-session/csm-presence.h
-index 41de5aa..d2713ab 100644
---- a/cinnamon-session/csm-presence.h
-+++ b/cinnamon-session/csm-presence.h
-@@ -50,9 +50,6 @@ struct _CsmPresenceClass
- 
-         void          (* status_changed)        (CsmPresence     *presence,
-                                                  guint            status);
--        void          (* status_text_changed)   (CsmPresence     *presence,
--                                                 const char      *status_text);
--
- };
- 
- typedef enum {
-@@ -69,9 +66,6 @@ typedef enum
- } CsmPresenceError;
- 
- #define CSM_PRESENCE_ERROR csm_presence_error_quark ()
--GType          csm_presence_error_get_type       (void);
--#define CSM_PRESENCE_TYPE_ERROR (csm_presence_error_get_type ())
--
- GQuark         csm_presence_error_quark          (void);
- 
- GType          csm_presence_get_type             (void) G_GNUC_CONST;
--- 
-2.44.2
-
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
deleted file mode 100644
index cee6e14b8fe1..000000000000
--- a/gnome-extra/cinnamon-session/files/cinnamon-session-6.0.0-fix-optional-systemd.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-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 bdfc9478cb4e..72644177c80a 100644
--- a/gnome-extra/cinnamon-settings-daemon/Manifest
+++ b/gnome-extra/cinnamon-settings-daemon/Manifest
@@ -1,6 +1,3 @@
-AUX cinnamon-settings-daemon-6.0.0-c99.patch 1002 BLAKE2B b816574312cbb0d9e9cf05e8dfbd94c9892aeae84406e7405c820ab404103853a5757d3c364f929dd9bc3c3f4a1adfe257b15c3554ce244774e44742893c6467 SHA512 e78eaa1e7b53525297672c4045e611890e9be847ddf881c46b8dbbf155cd82068c504c9ea9f54da44d616f682c87066c9d283520b951e8433442c4dd2bfc5f76
-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-r1.ebuild 2450 BLAKE2B 03f353e29c80d086fc0b968add603b1b7657dc40e92141fda50bee83d963300bd82546d422bde197cfc18ad93f443ccda8e93ab6a5cd5f2ad44af4b8ef942d3a SHA512 1ed6e8f0986c908f9b49d1d8f64508c73322a648d70e2bd052b0c73bc242becbe790dc4ba9c601a7b3c16cd8aaf63a6bf19b953e844f6f7dbfe7b7e8193e23a7
 MISC metadata.xml 504 BLAKE2B 99901d6f11af1367053f408c6fc1dffafa3903dc04b9a38faed0b3261e578c33fad49948ce09ecfb6d277472a3f9c3d088a32231b02236677071413dc3d4917e SHA512 f5afa4c1e73b6765aee16c5762b3145223bf4c56cae60b7e65ef503aec0f684276de2a7a22b0b866996cd96376cfc69e36e395ad3da9e7ce593732cb075fd64c
diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-6.0.0-r1.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-6.0.0-r1.ebuild
deleted file mode 100644
index 4f9a1ab66101..000000000000
--- a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-6.0.0-r1.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit meson gnome2-utils python-any-r1 xdg
-
-DESCRIPTION="Cinnamon's settings daemon"
-HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon-settings-daemon"
-SRC_URI="https://github.com/linuxmint/cinnamon-settings-daemon/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+ LGPL-2+ LGPL-2.1 LGPL-2.1+ MIT"
-SLOT="0"
-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-6.0:0=
-	media-libs/fontconfig
-	>=media-libs/lcms-2.2:2
-	media-libs/libcanberra[gtk3,pulseaudio]
-	>=media-libs/libpulse-0.9.16[glib]
-	>=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
-	x11-libs/libXfixes
-	x11-libs/libXi
-	>=x11-libs/libxklavier-5.0:=
-	>=x11-libs/pango-1.20.0
-	>=sys-power/upower-0.9.11:=
-
-	colord? ( >=x11-misc/colord-0.1.27:= )
-	cups? (
-		>=net-print/cups-1.4[dbus]
-		app-admin/system-config-printer
-		net-print/cups-pk-helper )
-	input_devices_wacom? (
-		>=dev-libs/libwacom-0.7:=
-		>=gnome-base/librsvg-2.36.2 )
-	smartcard? (
-		dev-libs/nspr
-		>=dev-libs/nss-3.11.2
-	)
-	systemd? ( sys-apps/systemd:0= )
-	!systemd? ( sys-auth/elogind )
-"
-DEPEND="
-	${RDEPEND}
-	dev-libs/libxml2:2
-	x11-base/xorg-proto
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-util/glib-utils
-	dev-util/gdbus-codegen
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.0.0-c99.patch
-)
-
-src_prepare() {
-	default
-	python_fix_shebang install-scripts
-}
-
-src_configure() {
-	# gudev not optional on Linux platforms
-	local emesonargs=(
-		-Duse_gudev=enabled
-		-Duse_polkit=enabled
-		-Duse_logind=enabled
-		$(meson_feature colord use_color)
-		$(meson_feature cups use_cups)
-		$(meson_feature smartcard use_smartcard)
-		$(meson_feature input_devices_wacom use_wacom)
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-6.0.0-c99.patch b/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-6.0.0-c99.patch
deleted file mode 100644
index 36ce9365a554..000000000000
--- a/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-6.0.0-c99.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-https://bugs.gentoo.org/919084
-https://github.com/linuxmint/cinnamon-settings-daemon/commit/48da3c4763bea93ea3e1d2ba2e2dfdb7f41d8afc
-
-From 48da3c4763bea93ea3e1d2ba2e2dfdb7f41d8afc Mon Sep 17 00:00:00 2001
-From: Leigh Scott <leigh123linux@gmail.com>
-Date: Mon, 5 Feb 2024 16:07:03 +0000
-Subject: [PATCH] Fix compile issue (#386)
-
-(Warning becomes an error due to gcc 14 changes)
---- a/plugins/keyboard/gkbd-configuration.c
-+++ b/plugins/keyboard/gkbd-configuration.c
-@@ -340,11 +340,11 @@ gkbd_configuration_get_xkl_engine (GkbdConfiguration *configuration)
- const char * const *
- gkbd_configuration_get_group_names (GkbdConfiguration *configuration)
- {
--	return configuration->priv->full_group_names;
-+	return (const char * const *)configuration->priv->full_group_names;
- }
- 
- const char * const *
- gkbd_configuration_get_short_group_names (GkbdConfiguration *configuration)
- {
--	return configuration->priv->short_group_names;
-+	return (const char * const *)configuration->priv->short_group_names;
- }
-
diff --git a/gnome-extra/cinnamon-translations/Manifest b/gnome-extra/cinnamon-translations/Manifest
index 5dc7af951b4e..879e92fdbf55 100644
--- a/gnome-extra/cinnamon-translations/Manifest
+++ b/gnome-extra/cinnamon-translations/Manifest
@@ -1,5 +1,3 @@
-DIST cinnamon-translations-6.0.2.tar.gz 13436254 BLAKE2B 50b9813c608935830c772466ad01f5818d7775467127c486c1543e2c51f4b828b536436939cd50cb68adb562aa043edaed4d10839b8e17038668e0cd87253197 SHA512 e23fe7f7da8856f3794c970671242bfdda1d84fee7357a7d30e09de15f988b9293b49dcbb44687ba4c495708b4fe067d6e8b851fac190b7f1f123ae19745f375
 DIST cinnamon-translations-6.2.2.tar.gz 13640380 BLAKE2B 336b64c305e1b6f04a9cfb54283d006f171fc8dbaa112412f5f1300439e8b58ae429e8aa11ccbcf223ef008e9f7b2943180c2989b3eeac8cfafda7902bdc04aa SHA512 58f7aa285c786678fdcdbbbc4195a9c3cc7d0134535b693c6e517bda6d1afe3bd4de36eb32e75630e773d1de5a2733e069f9277daa3083572929a05190097c35
-EBUILD cinnamon-translations-6.0.2.ebuild 1391 BLAKE2B 4eae929182c4924b65efa5c1ce7f935c30f6c5141e7f33c5b5627dd362c3aaa234582827c69e22805fb57770e4c9e93c14b9849563f4475e487980805c24d910 SHA512 d807f807898da7633bb2dfd2be02ff509d72f78f16fbc0997f575c173b225332d557abd5635bcd162d6c363baa755431aeceb6a39c56c689e65de8e477746fcc
 EBUILD cinnamon-translations-6.2.2.ebuild 1398 BLAKE2B 1f0ebbfa6147219cc167de94e6282751854ee5d7054fe61acbb72ca12e8c69adb3f33fcc624fe2c9e52089dbd95241da6bba3fe414e74aaabc971eaa2c7652f6 SHA512 2a4ec6d190a0ccfac26caad8a89734403704203d6eaab9c1d77c00b46fa340f50200047fd0f4b04e9e1028ab4943385a818283db88383911bc5b288107ec46a9
 MISC metadata.xml 501 BLAKE2B 79e5e721119bb7673c44beae1cfdb6d6987a028a3b16971170ba860c4edf845c6c51c236e4de5430a005e65dd364ea34937d821d47941ad03dbe4da436f6d729 SHA512 4a44ddca6b9e365a71f358d68d24b5cfe62d0cecbfe7c3b86e55c1e5d12e926414f7ae5bc73817eeac3c915f6a9aebfa141b7b880fa6f45d58d01225e2bb1cc3
diff --git a/gnome-extra/cinnamon-translations/cinnamon-translations-6.0.2.ebuild b/gnome-extra/cinnamon-translations/cinnamon-translations-6.0.2.ebuild
deleted file mode 100644
index 399bfe23a99a..000000000000
--- a/gnome-extra/cinnamon-translations/cinnamon-translations-6.0.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# 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 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
-
-DESCRIPTION="Translation data for Cinnamon"
-HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon-translations"
-SRC_URI="https://github.com/linuxmint/cinnamon-translations/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~loong ~ppc64 ~riscv x86"
-
-BDEPEND="sys-devel/gettext"
-
-src_configure() { :; }
-
-src_install() {
-	# Cannot run before since locales are not in the expected place for this to work
-	plocale_find_changes "${S}"/usr/share/locale "" ""
-
-	install_locale() {
-		insinto /usr/share/locale
-		doins -r usr/share/locale/${1}
-	}
-	plocale_for_each_locale install_locale
-}
diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest
index 5534008da969..f2038ce69257 100644
--- a/gnome-extra/cinnamon/Manifest
+++ b/gnome-extra/cinnamon/Manifest
@@ -4,8 +4,6 @@ AUX cinnamon-6.2.0-fix-arm64-settings-panel-path.patch 1832 BLAKE2B 15f3300a695f
 AUX cinnamon-6.2.0-optional-wayland.patch 2333 BLAKE2B 2c52be837f95f24a20c4a4a506891bba315eefcbc7574b8024c741881d3b04c7bbebba716539d52ee960c5d2295812d81b0affc6112ae2fca0c80a845e95b4e3 SHA512 c43995dec07d4be77bc1c14c1a73d8d8d1acef9ab22479a1bd74067aed162523a21279aa7f3b45353e555708b2af9d0ea6ac39dc1150bd2b9cc1da57941f1b0c
 AUX cinnamon-6.2.0-polkit-agent-on-x11.patch 2440 BLAKE2B ddecfd38e2ac60ab9089e68708efae1e24e5c597c2523222e2b8be4f0f71020dc2dff7008e4c4d895fb58d345263e6176e2f097e96ed7d5c98966dc41d447a4f SHA512 e8b72d5c024a8b3b5d4b171c43f0528e2915a21d21893bb4fb4c5fe2a5e9ce6272c9da781a9282f1445b6643929e666af325c3f4d0e755e53365861b9279c078
 AUX polkit-cinnamon-authentication-agent-1.desktop 252 BLAKE2B 8a7c10fa19e19c479ab40e9599b8804bc42a78548b9a09f34edc497dc5c9cbcd6958dbbb93cede57c0bf7938cc22f49c229274941b9509ad220e8790ed26bf9e SHA512 7857dc3d08129c37c461b85049d3a12b6602853d7dc44e68d79ce28bbe1121051a2061a4a4de050402230f85755d2800143e3373708fa19d43a001f7f1100360
-DIST cinnamon-6.0.4.tar.gz 2538844 BLAKE2B de67c2e465d04dd4ed269172b4b58cfe0391446466e32e15410b5a847248566c075823d0a2fb87d7a693033b3e4e1fc21a18c7b9f45dca89ce8968a0be71eaba SHA512 357dd44f40b195a4a3ca3e88c5c9e55f1c06d36b4cec812a001c54ffb784b0d67bb9f41c1ae74fec590184b3480c9cd21ae54f7ee01e31f80eab0297b0d18a9c
 DIST cinnamon-6.2.9.tar.gz 2547804 BLAKE2B 13a03e5f521d79f6929c16802629fb99b86d7e7f09ea65df76505b8216aa54ca37471a59ed68437bc470df34ca6b5b79e1b66df33721736e2a2c802b8a7755d8 SHA512 8226dedfa26069fd86e6e52daa5bfd46b54de58865cd98e07715caf8843ec1981b28fa2c8195ab153e127156eee6d6b6cd7e94eb715a66c206c0a7e9452fed11
-EBUILD cinnamon-6.0.4.ebuild 5945 BLAKE2B 17ae5056db7e7e1851f9f479907b1bf7afa274ec5bed469c47c05981d4cc7683587b29cd1f0b5b7005687ae0284ead7db55376135e4ebaaa457b75f1f459e07a SHA512 6030813b585ae55b23922d91be537e92c73c2ae7b0e0b2a074b09f07567344825a80b478a167c8b61c6f18eb6b6abfa739d1d6163e44e3af31e97123d757dbf5
 EBUILD cinnamon-6.2.9.ebuild 5958 BLAKE2B 617b2963485bf1d6990d275b87147312d00b4747ca9467ab88761251009faf51b385a930a01ec8506704e779f272a27e4bd3f1566e6d38deadab061cf9c6047a SHA512 c3d6778646849044eea584f58e3ddef19dd679e91ac4b81d265383ad6fbb996e718bbaa334dedabe18959c58b35f24022c8524fec573532e33076043b665fe2d
-MISC metadata.xml 804 BLAKE2B eb34dbf26a7366035f626b9edb3229b47bd351a740baefeffaadfd337a37b132fa3ec939de647d7f3b77a06e05d0d21158b86c3201e4d089cc5312e817031cba SHA512 cb2c2ab9ad69af9951e149bd26e6345ad90b22916239d00d44d0dbd57367172b8d1e7c09666529eb0d84b2e14e62484cddc50e0b201d82bf373af7d01cc221b6
+MISC metadata.xml 685 BLAKE2B abc17d8b8cf6c9e0886fe404030821ac588090c26477e72e4d8a0bdc7cc26b20dc130c7a7b41cd240db4c8073f05fd9947447ae517cfc2646d59aeb35c1783f6 SHA512 84b352a0ebcc832bd71733e4b9b5954bcdf2005e18d357f5d39f03d177b7be6f8477e88965c8b66119da5209071745a197f21a9d049bbed8e903f794bf110b62
diff --git a/gnome-extra/cinnamon/cinnamon-6.0.4.ebuild b/gnome-extra/cinnamon/cinnamon-6.0.4.ebuild
deleted file mode 100644
index 7b9098651020..000000000000
--- a/gnome-extra/cinnamon/cinnamon-6.0.4.ebuild
+++ /dev/null
@@ -1,199 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{10..12} )
-PYTHON_REQ_USE="xml(+)"
-
-inherit meson gnome2-utils pax-utils python-single-r1 xdg
-
-DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2"
-HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon"
-SRC_URI="https://github.com/linuxmint/cinnamon/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD GPL-2+ GPL-3+ GPL-3-with-openssl-exception LGPL-2+ LGPL-2.1 LGPL-2.1+ MIT"
-SLOT="0"
-IUSE="+desktop-portal +eds +gstreamer gtk-doc +nls +networkmanager wayland"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-KEYWORDS="amd64 ~arm64 ~loong ~riscv x86"
-
-DEPEND="
-	${PYTHON_DEPS}
-	>=app-accessibility/at-spi2-core-2.46.0:2
-	>=dev-libs/glib-2.52.0:2[dbus]
-	>=dev-libs/gobject-introspection-1.29.15:=
-	dev-libs/libxml2:2
-	>=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,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.8.2[introspection]
-	>=x11-wm/muffin-6.0[introspection,wayland?]
-
-	eds? (
-		gnome-extra/evolution-data-server
-	)
-	gstreamer? (
-		media-libs/gst-plugins-base:1.0
-		media-libs/gstreamer:1.0
-	)
-	networkmanager? (
-		net-misc/networkmanager[introspection]
-	)
-"
-# caribou used by onscreen keyboard
-# libtimezonemap used by datetime settings
-# iso-flag-png (unpackaged) used by keyboard layout settings
-RDEPEND="
-	${DEPEND}
-	>=app-accessibility/caribou-0.3
-	dev-libs/keybinder:3[introspection]
-	dev-libs/libtimezonemap
-	$(python_gen_cond_dep '
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-		dev-python/distro[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/pycairo[${PYTHON_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-		dev-python/pyinotify[${PYTHON_USEDEP}]
-		dev-python/python-pam[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/setproctitle[${PYTHON_USEDEP}]
-		dev-python/tinycss2[${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-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:3.0[introspection]
-	net-misc/wget
-	sys-apps/accountsservice[introspection]
-	sys-apps/coreutils
-	sys-apps/pciutils
-	sys-apps/util-linux
-	sys-power/upower[introspection]
-	x11-misc/xdg-utils
-	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-6.0
-	)
-"
-BDEPEND="
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-
-	gtk-doc? ( dev-util/gtk-doc )
-"
-
-PATCHES=(
-	# Fix backgrounds path as cinnamon doesn't provide them
-	# https://github.com/linuxmint/Cinnamon/issues/3575
-	"${FILESDIR}"/${PN}-3.8.0-gnome-background-compatibility.patch
-
-	# Use wheel group instead of sudo (from Fedora/Arch)
-	# https://github.com/linuxmint/Cinnamon/issues/3576
-	"${FILESDIR}"/${PN}-3.6.6-wheel-sudo.patch
-)
-
-src_prepare() {
-	xdg_src_prepare
-
-	# Add polkit agent to required components
-	# https://github.com/linuxmint/Cinnamon/issues/3579
-	sed -i "s/'REQUIRED', '/&polkit-cinnamon-authentication-agent-1;/" meson.build || die
-
-	# shebang fixing craziness
-	local p
-	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() {
-	local emesonargs=(
-		$(meson_use gstreamer build_recorder)
-		$(meson_use gtk-doc docs)
-		-Ddisable_networkmanager=$(usex networkmanager false true)
-		-Dpy3modules_dir="$(python_get_sitedir)"
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	python_optimize "${D}$(python_get_sitedir)"
-	python_optimize "${ED}"/usr/share/cinnamon/
-
-	# Required for gnome-shell on hardened/PaX, bug #398941
-	pax-mark mr "${ED}"/usr/bin/cinnamon
-
-	# Doesn't exist on Gentoo, causing this to be a dead symlink
-	rm "${ED}/etc/xdg/menus/cinnamon-applications-merged" || die
-
-	# Ensure authentication-agent is started, bug #523958
-	# https://github.com/linuxmint/Cinnamon/issues/3579
-	insinto /etc/xdg/autostart/
-	doins "${FILESDIR}"/polkit-cinnamon-authentication-agent-1.desktop
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-
-	if use gstreamer; then
-		if ! has_version 'media-libs/gst-plugins-good:1.0' || \
-		   ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then
-			ewarn "To make use of Cinnamon's built-in screen recording utility,"
-			ewarn "you need to either install media-libs/gst-plugins-good:1.0"
-			ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change"
-			ewarn "org.cinnamon.recorder/pipeline to what you want to use."
-		fi
-	else
-		ewarn "Cinnamon's built-in screen recording utility is not installed"
-		ewarn "because gstreamer support is disabled."
-	fi
-}
-
-pkg_postrm() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/cinnamon/metadata.xml b/gnome-extra/cinnamon/metadata.xml
index 3eaadcd0d9a0..5170275f61aa 100644
--- a/gnome-extra/cinnamon/metadata.xml
+++ b/gnome-extra/cinnamon/metadata.xml
@@ -13,7 +13,6 @@
 		<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>
 		<flag name="internal-polkit">Use Cinnamon's internal polkit agent instead of <pkg>gnome-extra/polkit-gnome</pkg>. This does not currently support multi-user fast switching.</flag>
 	</use>
 </pkgmetadata>
diff --git a/gnome-extra/cjs/Manifest b/gnome-extra/cjs/Manifest
index 7c352ff7c4cb..1be302677a88 100644
--- a/gnome-extra/cjs/Manifest
+++ b/gnome-extra/cjs/Manifest
@@ -1,5 +1,3 @@
-DIST cjs-6.0.0.tar.gz 877404 BLAKE2B 4290f0801f715aab1387da2ce0724376912db8ff3ad16fa8ad7eff03538dfc53ecbff2b7df0e70e52d16295b23ce51024da735d0e618b995fd3d3dfe297f9e26 SHA512 4cb359bf817d22a727683fd451ad6bde19aff4409e9033a97ef9cb204b3bd4c5e86421d7c01a267c3b4d42feb9b3bc5effb6fd970b3baf733242868c09536d95
 DIST cjs-6.2.0.tar.gz 874457 BLAKE2B 7b1afda55bc0b5da165a20afa7be58382b8f03f1421bde960f6a3f134d7bdb2bdd44320b0b613f4f710258379da6666383a20d92556a1172971ca8340ae6d348 SHA512 5f7ce7f1ba648db834d7703e909ef65cf369d47147ca02e90b8844c31b4360dcc0fb94bbd3265632c3de8ef2b026934dd799b94a2ff3895442a2f9fc469f53db
-EBUILD cjs-6.0.0.ebuild 2308 BLAKE2B 09e1ccb3f292bf706ce59d9360225e398f96a8fd0fa0a2be2bd1334e4a4bd88903f4bbfb4163f3931c62bae46800c77d2cbfa3ebe3aaa042f4210ca24d5e55d6 SHA512 15850b794b84057e27227bb4dd95c4555a5896d2cd684308e9e331e8acaa1703892eeb5d7465d78291c11cbb88d61eb9058532265fa7bc7a75b283478815cb94
 EBUILD cjs-6.2.0.ebuild 2308 BLAKE2B a4b05f2b53a94f82b8de9791507ef73683eafb80ef3c077383ffad30a6efaa8e3eba929c7c83cacb2b52ab2d2e2a2a79d397cafb2610e485fc4482e11413b84f SHA512 bb7113c9118526e4a240038efa0294ad8255c6e88a0966fff8c314943cfd4b1db9ef5eea38a87f9d79d9185eeba2453613831d2b6bee9a7d6af47b209be0fd6c
 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
deleted file mode 100644
index 73c12443341d..000000000000
--- a/gnome-extra/cjs/cjs-6.0.0.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# 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 645815eb54b0..3268486f1a0c 100644
--- a/gnome-extra/nemo-fileroller/Manifest
+++ b/gnome-extra/nemo-fileroller/Manifest
@@ -1,5 +1,3 @@
-DIST nemo-fileroller-6.0.1.tar.gz 448422 BLAKE2B b4cf28839e9feecdc6716327e432c862c962c5a12bce79317096054a2be7beb2b932e5efd3f31241afed58bead533a085580999da8da3a08b97d76445fee0f8e SHA512 49b1bad2f1bcbd5f299ba9c0f4a1547e6297c5bfc49a959ad87cae6a50d8bb69a4b0e93c9b865e07299cadec71613920ea4f98efde1532d1e4e8ed264d88b8e4
 DIST nemo-fileroller-6.2.0.tar.gz 449642 BLAKE2B 762133790dd565b159a7a6310d2660b417c811a2d19fd2898b3e91a3eff875fa8ddb3e36b24768948da0c8438be949ce57dd18d36ea703ddb9deb978b4418a8f SHA512 b93d19820169b7e3fb3888b3bee7c5047616f1675cde3ca769663eda21d1884c3bafb1de7d22d92246f884a8484dca08075726dd70685f753b18ba97e8a6afc3
-EBUILD nemo-fileroller-6.0.1.ebuild 574 BLAKE2B 0074bfd73d55304c727a42d2edb505b9eaf907110f0508c0c8057ac2139c74aae70d26a98329a0b3f328b9cce0d0e2ac0c5e9288af64b0ebea08e0f1c0126582 SHA512 fbfe1501870f4ee65b9e27f5d21280e06372db5956cca64e0e22016bc39b74242383f88aedf377e94aff64d77599e51ff8ba2f2b2ae578505e48bc024ea85db8
 EBUILD nemo-fileroller-6.2.0.ebuild 573 BLAKE2B 786d782738dd68cbe582321b1b83bb70db4d158fd1e505a906a1d5f1ba529be51e7b5cc4e0fe5e3db353e70de74ed44c3b1d512e92b8e230670f9854a1ba7061 SHA512 d5db44ac2cc4932237a5723a3426009306820090967dd3a7db51b1a999bc3c69113e559d076aa930187eacf4261518f92fd900884c337df8f5ac93fc64de13f4
 MISC metadata.xml 495 BLAKE2B 448c4a1b019897c3d8098b970e31849035b0125b707ac744eb668f7d295c76de0f121235edd1e76dc931051ccee1a508897679845dadfea04baf3d832baac5a5 SHA512 c86fa92ffb7d82826c4188c1ac63131fce88b40f5b9e13e2ef3162b3c83cc2d7cb6968c0e3e894a93e685cac818b7284072c55a4e8114dd44636a4678c415702
diff --git a/gnome-extra/nemo-fileroller/nemo-fileroller-6.0.1.ebuild b/gnome-extra/nemo-fileroller/nemo-fileroller-6.0.1.ebuild
deleted file mode 100644
index 3beb37b48e4e..000000000000
--- a/gnome-extra/nemo-fileroller/nemo-fileroller-6.0.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv x86"
-
-DEPEND="
-	>=dev-libs/glib-2.14.0:2
-	>=gnome-extra/nemo-2.0.0
-"
-RDEPEND="
-	${DEPEND}
-	app-arch/file-roller
-"
-
-S="${WORKDIR}/nemo-extensions-${PV}/${PN}"
diff --git a/gnome-extra/nemo/Manifest b/gnome-extra/nemo/Manifest
index 30511a00682b..0d7c827e4a71 100644
--- a/gnome-extra/nemo/Manifest
+++ b/gnome-extra/nemo/Manifest
@@ -1,7 +1,4 @@
 AUX nemo-5.0.3-use-detex.patch 252 BLAKE2B 24c27845065f64a58411a8d719fbc1ca41362001f08d469bc336f55601e49358c02ba3aba423c521a261955a5da9832d8ae2df49f3d372270e63256a45fafcda SHA512 142bd88c7843fa40fb30cab01f8f7dd23b2b5c338eae2ac5971c7e392f9f24a8a820ef4b17b1c4afea729cc85a66cb7ddb06ecd417ff6ad494118fe8d88f1498
-AUX nemo-6.0.0-fix-optional-wayland.patch 2103 BLAKE2B ad99989113d7d65d586709f78f68dd28c016fb56c33465aa38c2282ac0ff57669efab45f5547b5b983554401b32fef472362ab9e12a66715c6a0c89a27f173da SHA512 0a32ba81d1c79e9a008a9480d3901a17e55af67a8043041adc9f77989999fdf6ece0c654eb8fb62cbda5ade9104f1d52990ca3f38686fe8483d08d8163d4b210
-DIST nemo-6.0.2.tar.gz 1480887 BLAKE2B d1e3892938cb81bcb676626a9ef54362939d522a6d09befe25dd77a236a7eee3e06461da1855317bff2a5f201bc142903ce085bfbafdbddca0700a177221ccdf SHA512 05e8a6ab785f527ad61c1fe57d372ae8ea8f77d27ec8608d38e99f5f0f9065aecef4b84d1b016b682d14320d7099806d5672a101c0a370429d1c3f2a341fed1c
 DIST nemo-6.2.8.tar.gz 1505198 BLAKE2B fc74ab19e5aef65ba279f212f505cab91aa0dc92b19d31d4ae2f44b3222bd2278fbdf0df0bc36fa3973b91c9c06fab2c211b58c8d840deef5e60d5dbcbfa4dd7 SHA512 cd943603cfb14cc9d50466872607d191a3af7ff61f05549407caa5d9dfe606e080d6eb40d17bbcdf3a9e810bcc493f3be087b1eac6c8272746cd72c9751822af
-EBUILD nemo-6.0.2.ebuild 3298 BLAKE2B 0b05154d8ee7cfc59bee22e3699fea029c1c54ab144b67d86055e345f65f607c26ec9b78746b6e647e80b55acf4b782d38b475c9af772fa87bf32a790ff10d01 SHA512 78cd898687b6be0ef0e86a43285fc6eb3283407ce8aa4cc11d5e6e28ff6e87ea86f0dbd27fe44d5bb12ad61a03775fab771b9fed4787c7109907a62b25c0288f
 EBUILD nemo-6.2.8.ebuild 3324 BLAKE2B fa2a18975766ebf8437497803b93921e577054a440d27ca0da3bd3579ed148ddb2ea6ed54bb44229d4870747951b01f5a011bf8775e43532c80a948b68fc681e SHA512 13c750499caabf886ada0f8c339f163efd6768a378317450ee090686671278c064861ff12bed95e0e24a7e6d92aeaca37746b02668fbadb7003e7ca1fe8ecd3a
 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
deleted file mode 100644
index 559abbde0a47..000000000000
--- a/gnome-extra/nemo/files/nemo-6.0.0-fix-optional-wayland.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-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-6.0.2.ebuild b/gnome-extra/nemo/nemo-6.0.2.ebuild
deleted file mode 100644
index c6bdeac5f1a2..000000000000
--- a/gnome-extra/nemo/nemo-6.0.2.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit meson gnome2-utils python-single-r1 readme.gentoo-r1 virtualx xdg
-
-DESCRIPTION="A file manager for Cinnamon, forked from Nautilus"
-HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/nemo"
-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 ~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
-RESTRICT="test"
-
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-	>=app-accessibility/at-spi2-core-2.46.0:2
-	>=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-6.0:0=
-	gnome-extra/libgsf:=
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.10.0:3[introspection,wayland=]
-	x11-libs/libX11
-	>=x11-libs/pango-1.40.0
-	>=x11-libs/xapp-2.8.2
-
-	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}
-	$(python_gen_cond_dep '
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-	')
-	x11-themes/adwaita-icon-theme
-
-	nls? (
-		>=gnome-extra/cinnamon-translations-6.0
-	)
-"
-PDEPEND="
-	>=gnome-base/gvfs-0.1.2
-"
-DEPEND="
-	${COMMON_DEPEND}
-	x11-base/xorg-proto
-"
-BDEPEND="
-	>=dev-util/gdbus-codegen-2.31.0
-	>=dev-util/intltool-0.40.1
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	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"
-FORCE_PRINT_ELOG="yes"
-DOC_CONTENTS="
-${PN} functionality can be extended by installing other packages.
-
-sys-apps/gnome-disk-utility - Mount archive files
-gnome-extra/nemo-fileroller - Extract/Create archive files
-
-${PN} search capabilities can be extended through external
-helpers. Install any of the following packages to make
-their associated file types searchable.
-
-epub                     - app-arch/unzip and app-text/html2text
-Image metadata           - media-gfx/exif
-MP3 tags                 - media-sound/id3
-Microsoft Office .doc    - app-text/catdoc
-Microsoft Office .xls    - dev-python/xlrd
-OpenDocument/LibreOffice - app-text/odt2txt or app-office/unoconv
-PDF                      - app-text/poppler[utils]
-PostScript               - app-text/ghostscript-gpl
-TeX                      - app-text/texlive-core
-"
-
-src_prepare() {
-	default
-	python_fix_shebang files/usr/share/nemo/actions install-scripts
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use exif)
-		$(meson_use xmp)
-		$(meson_use selinux)
-		$(meson_use tracker)
-		$(meson_use gtk-doc gtk_doc)
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	readme.gentoo_create_doc
-}
-
-src_test() {
-	virtx meson_src_test
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}