gentoo auto-resync : 07:08:2024 - 12:37:20

author: V3n3RiX <venerix@koprulu.sector> 2024-08-07 12:37:21 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2024-08-07 12:37:21 +0100
commit: b8c7370a682e4e29cda623222d17a790c01c3642 (patch)
tree: f6caa14689bd00a5760eadaa381ff41e50ef3c1b /gnome-extra
parent: 8a4997a7e2d1e36c089d4d76935b5a902d98d3d0 (diff)
49 files changed, 504 insertions, 655 deletions
diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index 34417d670f20..bb341e3048ca 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 a2bf03a3a59a..27271f21cf77 100644
--- a/gnome-extra/cinnamon-control-center/Manifest
+++ b/gnome-extra/cinnamon-control-center/Manifest
@@ -1,8 +1,7 @@
 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-5.8.2.tar.gz 3820570 BLAKE2B 3bc009e696c7d469b2a2e15aecc62f290e26d08f65400418666e4a5564a3a113107996326e1edec93a45e9cb935ea96946e385376fe7f1b4b1185425bb4d4964 SHA512 b7b726659ca712a81c8b52bf514c8f061f5146a4728a3f2172ac5658b947e3e72c3194513ac815efaa727664e03ce2684d8d491bfcf0f6e91ea4566d832e86a2
 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
+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.0.0.ebuild 2691 BLAKE2B 63a2dbe84c3ae8fc0f817e966a57517bceb29ef829eb425f89aa177baf2aad051ce39f236ec39355bd1714709290b229db73b7414560db8d110ea78187457fd1 SHA512 a0c54d3286b3f0d7c36b43df074ae340921546b236dabf4cdb0814a0656462a1e652a7415d49b11553f4d98f9208462b5a466c44a15668917268818799bb1c78
+EBUILD cinnamon-control-center-6.2.0.ebuild 2388 BLAKE2B 7e8f0a3a755e2864ea5deacdcf1f3b4d9eb9c23bd997cc50578a54839a0c92979c53cdda789ed8142cbf2a00b652a70fc56324638cf37527c9e9ada72c95254b SHA512 c5a64120e6870e86c6104cbdc3b6865b966aeebe396c823b40208be24a37cdd295260d54738d1865e61a8e3590e18fc908f5dc0e23d9696f3e98479ccdfdd96f
 MISC metadata.xml 762 BLAKE2B 5a4411060287e76154bd0727feae76a45e8992077d7cbc6d1ad102d933246d98b3349bf0dc516f35d538e6c1d4a5d427e1561b646b628d408a5743666f5f2ca7 SHA512 c03709d9a1c8d678ce0957d08516e49f8affa6be2153f30607c0f1be7c29a1e00f4955f2112e82dc7c3b3e410a6dabf5ba2bdd9f3141b6a5299068598decd0c3
diff --git a/gnome-extra/cinnamon-control-center/cinnamon-control-center-5.8.2.ebuild b/gnome-extra/cinnamon-control-center/cinnamon-control-center-5.8.2.ebuild
deleted file mode 100644
index f7998f0e2b56..000000000000
--- a/gnome-extra/cinnamon-control-center/cinnamon-control-center-5.8.2.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{10..11} )
-
-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"
-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-5.8:0=
-	>=gnome-extra/cinnamon-menus-5.8
-	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
-	>=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
-"
-
-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/cinnamon-control-center-6.0.0.ebuild b/gnome-extra/cinnamon-control-center/cinnamon-control-center-6.2.0.ebuild
index c6374005882f..7ee5c7dde989 100644
--- a/gnome-extra/cinnamon-control-center/cinnamon-control-center-6.0.0.ebuild
+++ b/gnome-extra/cinnamon-control-center/cinnamon-control-center-6.2.0.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 gnome2-utils python-any-r1 xdg virtualx
 
@@ -13,17 +13,17 @@ 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 wayland"
-REQUIRED_USE="modemmanager? ( networkmanager )"
 KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="+colord input_devices_wacom +networkmanager +modemmanager systemd test wayland"
+REQUIRED_USE="modemmanager? ( networkmanager )"
 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
+	>=gnome-extra/cinnamon-desktop-6.2:0=
+	>=gnome-extra/cinnamon-menus-6.2
 	media-libs/fontconfig
 	>=sys-auth/polkit-0.103
 	>=sys-power/upower-0.99.8:=
@@ -52,9 +52,6 @@ COMMON_DEPEND="
 			>=net-misc/modemmanager-0.7:=
 		)
 	)
-	gnome-online-accounts? (
-		>=net-libs/gnome-online-accounts-3.18.0:=
-	)
 "
 RDEPEND="
 	${COMMON_DEPEND}
@@ -85,12 +82,6 @@ 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
@@ -101,7 +92,6 @@ src_configure() {
 		$(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
diff --git a/gnome-extra/cinnamon-desktop/Manifest b/gnome-extra/cinnamon-desktop/Manifest
index 3f46e941bf32..2d5b539fb22e 100644
--- a/gnome-extra/cinnamon-desktop/Manifest
+++ b/gnome-extra/cinnamon-desktop/Manifest
@@ -1,6 +1,6 @@
 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
 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
+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 1716 BLAKE2B cadfa4e7818ad2c44ff69b9b01bf176cb04f903073c918ec7dcbfc3c552fe4745d300401100d70f0c7dbc72c52d06798597b3d94d1bb798b0d8ec3a766fa9bcc SHA512 cc6750e961db01d78363e5e7dc6f3b67f96496a69665422fdad4e1f0373ac07435b1860ca21e808464bbebc840ec5b7bb7a383491c4d145fd076173f74f517f9
 MISC metadata.xml 496 BLAKE2B c019ef51b10de9ccafed1294e6d436dcdc8f02735170afe9e038689c6c4d76fb3e099bc9ec7f10c2a50d2bfa5e1d1c191667a470d734effad53d9d299f431664 SHA512 41a99dd4e1aad85dda44e2168bc150e2c27bb40a45c0dfe0f085e502242e6a0704ad8b47f64140d81afa7ff096cac735c46827f3d949962400de92d769505cc4
diff --git a/gnome-extra/cinnamon-desktop/cinnamon-desktop-5.8.0.ebuild b/gnome-extra/cinnamon-desktop/cinnamon-desktop-6.2.0.ebuild
index d6d22e8ac163..5e5e6c760cc7 100644
--- a/gnome-extra/cinnamon-desktop/cinnamon-desktop-5.8.0.ebuild
+++ b/gnome-extra/cinnamon-desktop/cinnamon-desktop-6.2.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
+EAPI=8
 
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..13} )
 
 inherit meson gnome2-utils python-any-r1
 
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/linuxmint/cinnamon-desktop/archive/${PV}.tar.gz -> $
 
 LICENSE="GPL-1 GPL-2+ LGPL-2+ LGPL-2.1+ MIT"
 SLOT="0/4" # subslot = libcinnamon-desktop soname version
-KEYWORDS="amd64 ~arm64 ~loong ~ppc64 ~riscv x86"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.37.3:2[dbus]
@@ -37,6 +37,7 @@ DEPEND="
 "
 BDEPEND="
 	${PYTHON_DEPS}
+	dev-util/gdbus-codegen
 	dev-util/glib-utils
 	sys-devel/gettext
 	virtual/pkgconfig
@@ -50,6 +51,11 @@ src_prepare() {
 src_configure() {
 	local emesonargs=(
 		-Dpnp_ids="${EPREFIX}/usr/share/hwdata/pnp.ids"
+
+		# https://github.com/linuxmint/cinnamon-desktop/commit/7eadfb1da9a42384396978b8ab46e0725d18e04f
+		# > Unless/until this fixes an actual identified issue for us or provides significant advantages
+		# > we're not using it in Cinnamon.
+		-Dsystemd=disabled
 	)
 	meson_src_configure
 }
diff --git a/gnome-extra/cinnamon-menus/Manifest b/gnome-extra/cinnamon-menus/Manifest
index 5e15e0cf9be7..a413276b9085 100644
--- a/gnome-extra/cinnamon-menus/Manifest
+++ b/gnome-extra/cinnamon-menus/Manifest
@@ -1,5 +1,5 @@
-DIST cinnamon-menus-5.8.0.tar.gz 96346 BLAKE2B 3da1b4b3056d5fc0ec8fa22e01c160de4e61c05cf3ad10f216a95abcc63135f394146bfd1d77a54021e5aedee4b5d61077eadf49823171f5f5aa052d4c1947d6 SHA512 d7679412cca5537da47767a0bb9335deaf7177781bee26bec109e9c19c90f4fbaeba81837ce1b9203e5315185178bc720919bdfbb072a94c5a816d1ee63a0370
 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
+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 819 BLAKE2B b45b33abce4e1ae6844cec78a6dcdf79a4a0c0928f1309ec2fdafa83300e90d524fabe9635a39ee16d164d6f43396e756d70ad157398813e01e28717732b59ee SHA512 20a0026aca9ebd074571bc7d6bf3841d51847337d899038d5eab8acbc02d50b8c3d3bdfcbdce42f94e288b57feb42ba08f6f32e4cf59ea18f4d3a703ffdf6d5a
 MISC metadata.xml 494 BLAKE2B a27fd494a680cb42a41c806166cf6ce2f2df3d132d62af9e4a4f8c7ae66ecc93b05afc64e250122cdd62bad428fc065984ab68e31c0d6c5be2a070a8dc912d7b SHA512 1fe1a31acf83ea9070318e76a6acb09969c7dac0779292822a7d1800ac7be4392a26091a59bceeb3ce84381d95159c9c2c1cdb30e567c2b2896a2a02564656ff
diff --git a/gnome-extra/cinnamon-menus/cinnamon-menus-5.8.0.ebuild b/gnome-extra/cinnamon-menus/cinnamon-menus-6.2.0.ebuild
index a5672cc73e00..a8bc134f5056 100644
--- a/gnome-extra/cinnamon-menus/cinnamon-menus-5.8.0.ebuild
+++ b/gnome-extra/cinnamon-menus/cinnamon-menus-6.2.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit meson xdg
 
@@ -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 ~loong ~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 84408a035fde..f43501a27ee3 100644
--- a/gnome-extra/cinnamon-screensaver/Manifest
+++ b/gnome-extra/cinnamon-screensaver/Manifest
@@ -1,5 +1,5 @@
-DIST cinnamon-screensaver-5.8.1.tar.gz 158825 BLAKE2B ebbbc0690f3a423b300a2be045fbf07953278992c48cc5182bc1b31944afb15a19103b13752adea64083d6cb14406b04610285e11b9f52f0aa48d9e9d1a41e15 SHA512 ac7523816be3d4b3a70afe0117e44b5cb42cd72f52534ca33ad0e3ab94f666d382d952a7c7842dd5dfd36520779695056775d243aee6df1845c7d90ccb7172ae
 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
+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
+EBUILD cinnamon-screensaver-6.2.0.ebuild 1694 BLAKE2B 9c8c1a3d26fb879ff7b62aa3d699f4048afab7397850b7031aec7c12d4d1a0d70b5fa172881614ed163b9c90201b1d2d57f20e7598aeaf35f77a3770292ee463 SHA512 5ef13a121f23408ee6da9ca9bb08647c439be577dae6fe8fb39994cbeb26b30ff2c89e58c6dc72fdbb5df561bdfa22a453c7891cc26545c78af2f9032a32b7ef
 MISC metadata.xml 500 BLAKE2B 92b85c1d68491b0e4f88203070760f1e8d2b51b3bf9d3615e18a26cdaf6466eadaa700f18f1668a9b214a540fe01639a49a8535cd43435ddba192fef0267ce98 SHA512 35fc95aac49117f0bd643ccd17d2e461ad1cc5dc744256f6cf83f4248c087b33f66eb4352aeae8105983789e7f8ca74727fc48557f462edfba658d411bb536f7
diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-5.8.1.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-6.2.0.ebuild
index fc9ef780f88b..f5dfaf26eca7 100644
--- a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-5.8.1.ebuild
+++ b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-6.2.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
+EAPI=8
 
-PYTHON_COMPAT=( python3_{10..11} )
+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-5.8
+	>=gnome-extra/cinnamon-desktop-6.2
 	sys-libs/pam
 	>=x11-libs/gtk+-3.22:3[introspection]
 	x11-libs/cairo
@@ -36,14 +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.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 c6a416c05695..44ee7a755d22 100644
--- a/gnome-extra/cinnamon-session/Manifest
+++ b/gnome-extra/cinnamon-session/Manifest
@@ -1,9 +1,7 @@
 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-5.8.1.tar.gz 199477 BLAKE2B 9371089e3caa4765498c2fa3ab9e5de03d47a67bced8a1a14fec33d7aea3372950b1e8f7f88be825697c8a2899dc0812f6ec7c5fb008f4bf2f4b5bdc343c01cc SHA512 8a88834a639c74b227f0d666fa2bcb4c3f73859ff8de84a440e84af3f3343c41c47a896ccf0dc09cc7114b7c921e2f670aec7846c57ec92b8da3333be7955309
-DIST cinnamon-session-6.0.2.tar.gz 165188 BLAKE2B 077552f147a61d4615db8091411314560a12b5c40420381280e41a35395119ece15602f9c74bac3409b49d4363285a386555a787ced10dee5ca757d254ccb7ec SHA512 80e1c5b8654aad805424351c1a49cc3f68e52ddcf0606180fd5ee006607829f4f451c6bdd9be7e022a258041e8a6967faf0b16b8536a0a8982dcc805e35fd01a
 DIST cinnamon-session-6.0.4.tar.gz 165520 BLAKE2B fa608de433a4d47db102b1f11c716da8afeabd5772b7e957449297629e39bc215124acd2f0f94afe91763590ab92b06a3bce8dd1a6bad3997b9496b4114a36fa SHA512 cd8ac8579f9311f5234dad17fb32d40a1c58da2292734e58c4832d94a8b0687e4909f5886c2db0dab1e0c396f12c3495a8d966e76373ac26f3bd9795efcd1f1f
-EBUILD cinnamon-session-5.8.1.ebuild 1420 BLAKE2B 45ec08fd6e7e8772785f60316986776e407293cd6e8113d0d6d46e5bd3124268c0ce670bbe93bef8aa01314d122bf2f71cc69e951124d6d7cef986f515b0aa34 SHA512 45daba06db4328d5fb0a1b80e16c4abdf649de6c48a29ded174bfa8a4fb8e7cbd8b6525612f4b0ab458d5c11ae34ede09838c464daf79d96366ab9d5b2379da8
-EBUILD cinnamon-session-6.0.2.ebuild 1836 BLAKE2B a7154ca0b88e73a1e24dba105a19ef358e1ee3a67bee8a5336a466f7d510ae6a0f1aef428d65ea81c280cb219b487ca90c982d1ae607006ec68f25e01d995959 SHA512 97b42e560e08dd4b59586378ffb9aefb5183114059ec8a5074d6cb3ec2dbde84d92603ee53cfa84ff00382a34c174947b2b1e027a5b005079965b779c6967f54
+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 1676 BLAKE2B 6ffdd76bfc8a00e5a0a7446baa6cd891ae9b1592cb49a1868d92bf159a78937bdd82ff5a4b0252133ce82be8a67b61bd85b9babad2aff5d02d4a50267d125627 SHA512 7e1f26342ac7cbcbeb1fa2e70d282fb223f55b0d3c6c42df58e0dfc1c9d3207dfa2e5347f24c1b1a2416245c446eb01510c54ffce36526a4d53890fb4b11258e
 MISC metadata.xml 496 BLAKE2B 3b3170a447d7818cdd93b3183feee36751832a07da741b16dfdfe029e09733f3ba94815312e6444b3421dd7bc3df9b4ca2f1c1ac2a5d83ae3881b1ab7cf809c0 SHA512 65d223bf44f83d8d2bda72791b362c4302ec813e9090331cf5ddc97e10ed610c1a91c6d467ff72d7e1430e7d70dcfa09f9c8e35c50a86130236798c80e19a2f2
diff --git a/gnome-extra/cinnamon-session/cinnamon-session-5.8.1.ebuild b/gnome-extra/cinnamon-session/cinnamon-session-5.8.1.ebuild
deleted file mode 100644
index 1c60942403d3..000000000000
--- a/gnome-extra/cinnamon-session/cinnamon-session-5.8.1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit meson gnome2-utils python-any-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"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.37.3:2
-	media-libs/libcanberra[pulseaudio]
-	virtual/opengl
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3:3
-	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.6.1
-
-	systemd? ( >=sys-apps/systemd-183 )
-	!systemd? ( sys-auth/elogind[policykit] )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	x11-libs/xtrans
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	>=gnome-extra/cinnamon-desktop-5.8:0=
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-util/gdbus-codegen
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-	python_fix_shebang data
-}
-
-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/cinnamon-session-6.0.2.ebuild b/gnome-extra/cinnamon-session/cinnamon-session-6.2.1.ebuild
index 9bc622ec1f13..6d9a4f22cfa0 100644
--- a/gnome-extra/cinnamon-session/cinnamon-session-6.0.2.ebuild
+++ b/gnome-extra/cinnamon-session/cinnamon-session-6.2.1.ebuild
@@ -1,11 +1,11 @@
 # 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 gnome2-utils python-single-r1 xdg-utils
+inherit meson gnome2-utils python-single-r1
 
 DESCRIPTION="Cinnamon session manager"
 HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon-session"
@@ -13,13 +13,13 @@ SRC_URI="https://github.com/linuxmint/cinnamon-session/archive/${PV}.tar.gz -> $
 
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~loong ~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=
+	>=gnome-extra/cinnamon-desktop-6.2:0=
 	media-libs/libcanberra[pulseaudio]
 	virtual/opengl
 	x11-libs/cairo
@@ -34,7 +34,7 @@ COMMON_DEPEND="
 	x11-libs/libXrender
 	x11-libs/libXtst
 	x11-libs/pango[X]
-	>=x11-libs/xapp-2.8.1[introspection]
+	>=x11-libs/xapp-2.8.4[introspection]
 
 	systemd? (
 		>=sys-apps/systemd-183
@@ -62,12 +62,6 @@ 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 cinnamon-session-quit
diff --git a/gnome-extra/cinnamon-settings-daemon/Manifest b/gnome-extra/cinnamon-settings-daemon/Manifest
index 5180d055308b..9413dd777073 100644
--- a/gnome-extra/cinnamon-settings-daemon/Manifest
+++ b/gnome-extra/cinnamon-settings-daemon/Manifest
@@ -1,7 +1,6 @@
 AUX cinnamon-settings-daemon-6.0.0-c99.patch 1002 BLAKE2B b816574312cbb0d9e9cf05e8dfbd94c9892aeae84406e7405c820ab404103853a5757d3c364f929dd9bc3c3f4a1adfe257b15c3554ce244774e44742893c6467 SHA512 e78eaa1e7b53525297672c4045e611890e9be847ddf881c46b8dbbf155cd82068c504c9ea9f54da44d616f682c87066c9d283520b951e8433442c4dd2bfc5f76
-DIST cinnamon-settings-daemon-5.8.1.tar.gz 573541 BLAKE2B 50d8e6fb1fde50db7cc40c931e0904c0abfa429dc5757160fdb87ee2753f4d9e732ba4a0837c0480a73a3caffb084881c8aac336f8600afe976adc519b09aa01 SHA512 a5e92aa9ba463cff7db02e9d377a28b39e4c1dd25226ab9d4d59b5fd7b38267c6da5f31cfa052f1a8243de601c7484040be158e633b8932e2e68726860c7bfc3
 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
+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.0.0.ebuild 2181 BLAKE2B 3dbde6e25a2d7eab3b1b11d106f15faae7b6fb3723765ae918ce40fcca45e30a4b76d8229fd98554dae6640663ecc8fc1d80d301413c9ce7666eada536cc864f SHA512 dc039646f802bce210bf95b556412456dd420d386e592118e5db481f133cc8a76566715ef5554b4d2964e3e0e0b3797c1e4a386ca4a7501599336bb89e4bc521
+EBUILD cinnamon-settings-daemon-6.2.0.ebuild 2181 BLAKE2B 386cd671fb5c60a0857a39c51d0b86d1d673fd47e79cd7ca086a222f3b92178068aae76fdbbbed4bc499afa98b05b8a2151bda1a76fe94d0786a659776e703f3 SHA512 f8d346083adc87645e9d5f76ec3f4f794d858792c456008759b420eb0271b047c3f8261ef19aa662377c83ea0b25fc0e2dde0626b625fc7f8a5f0b601e1d4dab
 MISC metadata.xml 504 BLAKE2B 99901d6f11af1367053f408c6fc1dffafa3903dc04b9a38faed0b3261e578c33fad49948ce09ecfb6d277472a3f9c3d088a32231b02236677071413dc3d4917e SHA512 f5afa4c1e73b6765aee16c5762b3145223bf4c56cae60b7e65ef503aec0f684276de2a7a22b0b866996cd96376cfc69e36e395ad3da9e7ce593732cb075fd64c
diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-5.8.1.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-5.8.1.ebuild
deleted file mode 100644
index 64e210dddfed..000000000000
--- a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-5.8.1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{10..11} )
-
-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"
-
-RDEPEND="
-	>=dev-libs/glib-2.40.0:2[dbus]
-	dev-libs/libgudev
-	>=gnome-base/libgnomekbd-3.6:=
-	>=gnome-extra/cinnamon-desktop-5.8: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
-	>=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
-"
-
-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/cinnamon-settings-daemon-6.0.0.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-6.2.0.ebuild
index 83c4fac82c4b..bf665356ce46 100644
--- a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-6.0.0.ebuild
+++ b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-6.2.0.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 gnome2-utils python-any-r1 xdg
 
@@ -20,7 +20,7 @@ RDEPEND="
 	>=dev-libs/glib-2.40.0:2[dbus]
 	dev-libs/libgudev
 	>=gnome-base/libgnomekbd-3.6:=
-	>=gnome-extra/cinnamon-desktop-6.0:0=
+	>=gnome-extra/cinnamon-desktop-6.2:0=
 	media-libs/fontconfig
 	>=media-libs/lcms-2.2:2
 	media-libs/libcanberra[gtk3,pulseaudio]
diff --git a/gnome-extra/cinnamon-translations/Manifest b/gnome-extra/cinnamon-translations/Manifest
index 8ef20c1ab42e..74252799ba87 100644
--- a/gnome-extra/cinnamon-translations/Manifest
+++ b/gnome-extra/cinnamon-translations/Manifest
@@ -1,5 +1,5 @@
-DIST cinnamon-translations-5.8.2.tar.gz 13306978 BLAKE2B 91e71f3f4142fa6adb80c39a782b2db2c1d8f9e3dc12ea5883e081c0b27660a15753e0f4d69a7b4f47b9350221e705ef361e1e5fc1c027b92805ec59b08a9e2a SHA512 ccf678eb805c06932e35e8d44579e2f5b7c3dd4e1cda6a6bd184ef3da656ccbe62135ae960849e4aaf098ebe76b72760a5d542f134210760376f0d972b875279
 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
+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 1400 BLAKE2B ce180028fc2be82e05b995c5d7b2f70df405e0dc34a18685e69990f2aae033021037c803d16050d6c29cc0ebef82b0295746e16b3a8709897336ab35209c816e SHA512 5ab63273d8686474242bf08816c9d22aa56bd7640a7df46433feca0a8f4cc1b552e21cd4ecc6870ac964589c8096e07e77e2b6e57031a27e3c259c412df24e8c
 MISC metadata.xml 501 BLAKE2B 79e5e721119bb7673c44beae1cfdb6d6987a028a3b16971170ba860c4edf845c6c51c236e4de5430a005e65dd364ea34937d821d47941ad03dbe4da436f6d729 SHA512 4a44ddca6b9e365a71f358d68d24b5cfe62d0cecbfe7c3b86e55c1e5d12e926414f7ae5bc73817eeac3c915f6a9aebfa141b7b880fa6f45d58d01225e2bb1cc3
diff --git a/gnome-extra/cinnamon-translations/cinnamon-translations-5.8.2.ebuild b/gnome-extra/cinnamon-translations/cinnamon-translations-6.2.2.ebuild
index fb4c84a56c28..72ff8d9ebbe2 100644
--- a/gnome-extra/cinnamon-translations/cinnamon-translations-5.8.2.ebuild
+++ b/gnome-extra/cinnamon-translations/cinnamon-translations-6.2.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
+EAPI=8
 
-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"
+PLOCALES="aa af am an ar ary as ast ay az be be@latin ber bg bn bn_IN br bs ca ca@valencia ckb 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 ti 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 ~loong ~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 acf127c0ae3a..02090b152cbb 100644
--- a/gnome-extra/cinnamon/Manifest
+++ b/gnome-extra/cinnamon/Manifest
@@ -1,9 +1,11 @@
 AUX cinnamon-3.6.6-wheel-sudo.patch 1342 BLAKE2B 173bb9331b51cd0a3110477c8631bd2c887cba6c085d8e8f299810aa83fc83f3e72f8855c40e74637a0453f0fc6b47d972d1a54280ea2eb5538dbe08e7dccd49 SHA512 e59432ca4463652eb5f47075898b78b9025c3a83ca4a305a2c545b9791f8e715cb96c54c550175277dab53cac0f5a6c9fbf78352a09ac977a192e75e800ddb74
 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 cinnamon-6.2.0-fix-arm64-settings-panel-path.patch 1832 BLAKE2B 15f3300a695f12bd138ff4d3f4e67215d7d7f2e61cd15b84253a7573e0b4e2313697c443cae452b8f324df2b5e1c1161b97fc3f750e1da1207a21b7accad0d81 SHA512 9cf22a4072de3caf9be14405fd3f4ba96262cfc30aad8bb47b161f53ae7c1d6a061397cab1fe5515418e48d2d24919a113ae1b58e4f04fef26efd8a9f52cdbbc
+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-5.8.4.tar.gz 2517117 BLAKE2B 4c3f452480b9e3ce7713221f1b76c475204b8dc1bb34d42a8faf492b0ca86416bb2fbd3849a7f048fef672ecf4613f06c645ec548159b6c3662b7602142e75e6 SHA512 2eaa253cdd01f00cca05ed123db59fde27f84cc24d7b8a3ec751a5f8252642870cbece941d1101f31fe0db43c15d9779bbdcacbf7037757569a4d17205cb10ad
 DIST cinnamon-6.0.4.tar.gz 2538844 BLAKE2B de67c2e465d04dd4ed269172b4b58cfe0391446466e32e15410b5a847248566c075823d0a2fb87d7a693033b3e4e1fc21a18c7b9f45dca89ce8968a0be71eaba SHA512 357dd44f40b195a4a3ca3e88c5c9e55f1c06d36b4cec812a001c54ffb784b0d67bb9f41c1ae74fec590184b3480c9cd21ae54f7ee01e31f80eab0297b0d18a9c
-EBUILD cinnamon-5.8.4.ebuild 5427 BLAKE2B a4ba890d9f120f4afd0e6b8462566c8031829bff8582a723f2db31004c30a2c25213155e9b84edf6a6539f683ef87186fbca98a11bad7be83598751287b743fe SHA512 ebbd44078954d159000edf275794a5b657f92dbf6e7120b754d6ce0f843735660830eb2d9af78ad5959d1c6c4b8e5b125dbac889e9180d8e60fba535fe273b51
+DIST cinnamon-6.2.7.tar.gz 2547822 BLAKE2B 67f15fdd39c7168bcaa03f637fa6a4b9e9076657a92ba92472c69960c0c26fcad7aa0b4e1f6926e57d76364bf4a42f28381b67a03cba75de87a4fc31ef9e7377 SHA512 d8617cf73dd754b91915826527e674a8084ad141831112def661eac6b39b1c39e61e06fdf79bd7f0a7045b2abc29e223f8616796f5e51d1354486f0d0e4faf5a
 EBUILD cinnamon-6.0.4.ebuild 5945 BLAKE2B 17ae5056db7e7e1851f9f479907b1bf7afa274ec5bed469c47c05981d4cc7683587b29cd1f0b5b7005687ae0284ead7db55376135e4ebaaa457b75f1f459e07a SHA512 6030813b585ae55b23922d91be537e92c73c2ae7b0e0b2a074b09f07567344825a80b478a167c8b61c6f18eb6b6abfa739d1d6163e44e3af31e97123d757dbf5
-MISC metadata.xml 622 BLAKE2B 10b394cc9a24ba5609b2184c8d31439ae3e172055dba8d283c7bdf834ac715053c3533db0bce7f27d55b69a4891622b9cc21dcacdc0b797146e4144fc87d6b2e SHA512 f079066f4181bc467259651de9c83cedc0bbc4f0e817dac5ce081248001c23d4374ea393482400ffefae7edbb03fd61da87f114d6f4f65145200e156d0e9cc46
+EBUILD cinnamon-6.2.7.ebuild 5960 BLAKE2B bd41903ed576d8b40043ce5628c4152b50efd33d9d0b17614126c65a85151bbe492bf70fc7eeb0a517810227a54b2cfc630cd885dd67dde9fbc2dde448a58905 SHA512 23c9582050d6a9ea3ff5d5629f5c5ae4b55e1f9d27d81eb4b3c9a2fcbc794916197ce692a6c4e9812569883f1b618610e0d772a819adbf4fbd9bbea6a13e71d8
+MISC metadata.xml 804 BLAKE2B eb34dbf26a7366035f626b9edb3229b47bd351a740baefeffaadfd337a37b132fa3ec939de647d7f3b77a06e05d0d21158b86c3201e4d089cc5312e817031cba SHA512 cb2c2ab9ad69af9951e149bd26e6345ad90b22916239d00d44d0dbd57367172b8d1e7c09666529eb0d84b2e14e62484cddc50e0b201d82bf373af7d01cc221b6
diff --git a/gnome-extra/cinnamon/cinnamon-5.8.4.ebuild b/gnome-extra/cinnamon/cinnamon-6.2.7.ebuild
index c48b4ae8c30e..faad5075ad15 100644
--- a/gnome-extra/cinnamon/cinnamon-5.8.4.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-6.2.7.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
+EAPI=8
 
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..13} )
 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"
+KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
+IUSE="+eds +gstreamer gtk-doc internal-polkit +nls +networkmanager wayland"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-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.8:0=
-	>=gnome-extra/cinnamon-menus-5.8
-	>=gnome-extra/cjs-5.8[cairo]
+	>=gnome-extra/cinnamon-desktop-6.2:0=
+	>=gnome-extra/cinnamon-menus-6.2
+	>=gnome-extra/cjs-6.2[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.6.1[introspection]
-	>=x11-wm/muffin-5.8[introspection]
+	>=x11-libs/xapp-2.8.4[introspection]
+	>=x11-wm/muffin-6.2[introspection,wayland?]
 
 	eds? (
 		gnome-extra/evolution-data-server
@@ -72,31 +72,35 @@ RDEPEND="
 		dev-python/requests[${PYTHON_USEDEP}]
 		dev-python/setproctitle[${PYTHON_USEDEP}]
 		dev-python/tinycss2[${PYTHON_USEDEP}]
-		>=dev-python/python3-xapp-2.4.1[${PYTHON_USEDEP}]
+		>=dev-python/python3-xapp-2.4.2[${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.8[networkmanager=]
-	>=gnome-extra/cinnamon-screensaver-5.8
-	>=gnome-extra/cinnamon-session-5.8
-	>=gnome-extra/cinnamon-settings-daemon-5.8
-	>=gnome-extra/nemo-5.8
-	gnome-extra/polkit-gnome
+	>=gnome-extra/cinnamon-control-center-6.2[networkmanager=,wayland?]
+	>=gnome-extra/cinnamon-screensaver-6.2
+	>=gnome-extra/cinnamon-session-6.2
+	>=gnome-extra/cinnamon-settings-daemon-6.2[wayland?]
+	>=gnome-extra/nemo-6.2[wayland?]
 	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
 	sys-apps/pciutils
 	sys-apps/util-linux
+	sys-apps/xdg-desktop-portal-gtk
+	sys-apps/xdg-desktop-portal-xapp
 	sys-power/upower[introspection]
 	x11-misc/xdg-utils
 	x11-themes/adwaita-icon-theme
 	x11-themes/gnome-themes-standard
 
+	!internal-polkit? (
+		gnome-extra/polkit-gnome
+	)
 	nls? (
-		>=gnome-extra/cinnamon-translations-5.8
+		>=gnome-extra/cinnamon-translations-6.2
 	)
 "
 BDEPEND="
@@ -110,23 +114,35 @@ BDEPEND="
 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
+	"${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
+	"${FILESDIR}/${PN}-3.6.6-wheel-sudo.patch"
 
-	# Fix pillow 10.0.0 compat
-	# https://github.com/linuxmint/Cinnamon/issues/3576
-	"${FILESDIR}"/${PN}-pillow-10-support.patch
+	# Make wayland optional
+	# https://github.com/linuxmint/cinnamon/pull/12273
+	"${FILESDIR}/${PN}-6.2.0-optional-wayland.patch"
+
+	# Fix path for settings panels on arm64
+	# https://github.com/linuxmint/cinnamon/pull/12278
+	"${FILESDIR}/${PN}-6.2.0-fix-arm64-settings-panel-path.patch"
 )
 
 src_prepare() {
-	xdg_src_prepare
+	if use internal-polkit; then
+		PATCHES+=(
+			# Use internal polkit agent on X11
+			# https://github.com/linuxmint/cinnamon/pull/12272
+			"${FILESDIR}/${PN}-6.2.0-polkit-agent-on-x11.patch"
+		)
+	else
+		# 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
+	fi
 
-	# 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
+	default
 
 	# shebang fixing craziness
 	local p
@@ -139,6 +155,7 @@ src_configure() {
 	local emesonargs=(
 		$(meson_use gstreamer build_recorder)
 		$(meson_use gtk-doc docs)
+		$(meson_use wayland)
 		-Ddisable_networkmanager=$(usex networkmanager false true)
 		-Dpy3modules_dir="$(python_get_sitedir)"
 	)
@@ -154,13 +171,15 @@ src_install() {
 	# 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
+	# Doesn't exist by default
+	keepdir /etc/xdg/menus/applications-merged
 
-	# 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
+	if ! use internal-polkit; then
+		# 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
+	fi
 }
 
 pkg_postinst() {
diff --git a/gnome-extra/cinnamon/files/cinnamon-6.2.0-fix-arm64-settings-panel-path.patch b/gnome-extra/cinnamon/files/cinnamon-6.2.0-fix-arm64-settings-panel-path.patch
new file mode 100644
index 000000000000..c81de09a6c43
--- /dev/null
+++ b/gnome-extra/cinnamon/files/cinnamon-6.2.0-fix-arm64-settings-panel-path.patch
@@ -0,0 +1,38 @@
+From eadca68df52f0fd7db2035c7dad3bb87240ecf34 Mon Sep 17 00:00:00 2001
+From: Sparky Bluefang <sparky@bluefang-logic.com>
+Date: Sat, 6 Jul 2024 04:43:53 -0400
+Subject: [PATCH] Simplify 64bit path handling. More than x86_64 uses
+ /usr/lib64 (i.e. arm64/aarch64). One additional path check is probably not
+ worth enumerating all of the applicable machine names.
+
+---
+ files/usr/share/cinnamon/cinnamon-settings/bin/capi.py | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/files/usr/share/cinnamon/cinnamon-settings/bin/capi.py b/files/usr/share/cinnamon/cinnamon-settings/bin/capi.py
+index 05d88dea20..77621a98a8 100644
+--- a/files/usr/share/cinnamon/cinnamon-settings/bin/capi.py
++++ b/files/usr/share/cinnamon/cinnamon-settings/bin/capi.py
+@@ -27,20 +27,18 @@ def __init__(self):
+         self.extension_point = Gio.io_extension_point_register ("cinnamon-control-center-1")
+         self.modules = []
+ 
+-        architecture = platform.machine()
+         # get the arch-specific triplet, e.g. 'x86_64-linux-gnu' or 'arm-linux-gnueabihf'
+         # see also: https://wiki.debian.org/Python/MultiArch
+         triplet = sysconfig.get_config_var('MULTIARCH')
+-        paths = ["/usr/lib", f"/usr/lib/{triplet}"]
++        paths = ["/usr/lib", "/usr/lib64", f"/usr/lib/{triplet}"]
+ 
+         # On x86 archs, iterate through multiple paths
+         # For instance, on a Mint i686 box, the path is actually /usr/lib/i386-linux-gnu
++        architecture = platform.machine()
+         x86archs = ["i386", "i486", "i586", "i686"]
+         if architecture in x86archs:
+             for arch in x86archs:
+                 paths += ["/usr/lib/%s" % arch]
+-        elif architecture == "x86_64":
+-            paths += ["/usr/lib/x86_64", "/usr/lib64"]
+         else:
+             paths += ["/usr/lib/%s" % architecture]
+ 
diff --git a/gnome-extra/cinnamon/files/cinnamon-6.2.0-optional-wayland.patch b/gnome-extra/cinnamon/files/cinnamon-6.2.0-optional-wayland.patch
new file mode 100644
index 000000000000..ca22e32f9fb7
--- /dev/null
+++ b/gnome-extra/cinnamon/files/cinnamon-6.2.0-optional-wayland.patch
@@ -0,0 +1,79 @@
+From 92bcc5aabd92001b4f05ce13875422066bf82732 Mon Sep 17 00:00:00 2001
+From: Sparky Bluefang <sparky@bluefang-logic.com>
+Date: Wed, 3 Jul 2024 02:13:13 -0400
+Subject: [PATCH] Optionally install wayland session files
+
+---
+ data/meson.build  | 13 +++++++------
+ meson.build       | 11 ++++++++---
+ meson_options.txt |  5 +++++
+ 3 files changed, 20 insertions(+), 9 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index f46bf967fb..807ea218a8 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -16,11 +16,10 @@ desktop_conf.set('bindir', join_paths(prefix, bindir))
+ desktop_conf.set('libexecdir', join_paths(prefix, libexecdir))
+ desktop_conf.set('VERSION', meson.project_version())
+ 
+-desktop_files = [
+-  'cinnamon.desktop',
+-  'cinnamon-wayland.desktop',
+-  'cinnamon2d.desktop',
+-]
++desktop_files = ['cinnamon.desktop', 'cinnamon2d.desktop']
++if get_option('wayland')
++    desktop_files += ['cinnamon-wayland.desktop']
++endif
+ 
+ foreach desktop_file : desktop_files
+     desktop = configure_file(
+@@ -40,7 +39,9 @@ foreach desktop_file : desktop_files
+ endforeach
+ 
+ subdir('xdg-portal')
+-subdir('wayland_sessions')
++if get_option('wayland')
++    subdir('wayland_sessions')
++endif
+ subdir('xsessions')
+ subdir('services')
+ 
+diff --git a/meson.build b/meson.build
+index d7705c0919..7b4c74c528 100644
+--- a/meson.build
++++ b/meson.build
+@@ -165,10 +165,15 @@ else
+     session_conf.set('REQUIRED', '')
+ endif
+ 
+-foreach file : ['cinnamon.session', 'cinnamon2d.session', 'cinnamon-wayland.session']
++session_files = ['cinnamon.session', 'cinnamon2d.session']
++if get_option('wayland')
++    session_files += ['cinnamon-wayland.session']
++endif
++
++foreach session_file : session_files
+     configure_file(
+-        input: file + '.in',
+-        output: file,
++        input: session_file + '.in',
++        output: session_file,
+         configuration: session_conf,
+         install_dir: join_paths(prefix, datadir, 'cinnamon-session', 'sessions'),
+     )
+diff --git a/meson_options.txt b/meson_options.txt
+index 82422246b0..321192d8c6 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -23,4 +23,9 @@ option('py3modules_dir',
+     value : '',
+     description: 'Where to install python3 modules'
+ )
++option('wayland',
++    type : 'boolean',
++    value : true,
++    description: 'Enable wayland support'
++)
+ 
diff --git a/gnome-extra/cinnamon/files/cinnamon-6.2.0-polkit-agent-on-x11.patch b/gnome-extra/cinnamon/files/cinnamon-6.2.0-polkit-agent-on-x11.patch
new file mode 100644
index 000000000000..7b8057fda647
--- /dev/null
+++ b/gnome-extra/cinnamon/files/cinnamon-6.2.0-polkit-agent-on-x11.patch
@@ -0,0 +1,75 @@
+From c6402be3b5eb84f53367ebd57b1a38664a240d44 Mon Sep 17 00:00:00 2001
+From: Sparky Bluefang <sparky@bluefang-logic.com>
+Date: Wed, 3 Jul 2024 02:10:18 -0400
+Subject: [PATCH] Use Polkit agent for X11 sessions. Don't crash if polkit
+ doesn't start properly.
+
+---
+ debian/control                     |  1 -
+ js/ui/main.js                      |  4 +---
+ js/ui/polkitAuthenticationAgent.js | 20 +++++++++++++++++++-
+ 3 files changed, 20 insertions(+), 5 deletions(-)
+
+diff --git a/debian/control b/debian/control
+index b9812a1276..d886fac1ec 100644
+--- a/debian/control
++++ b/debian/control
+@@ -85,7 +85,6 @@ Depends:
+  metacity,
+  nemo,
+  network-manager-gnome [linux-any],
+- policykit-1-gnome,
+  python3,
+  python3-dbus,
+  python3-distro,
+diff --git a/js/ui/main.js b/js/ui/main.js
+index 12bcfc0cfc..55703b96b3 100644
+--- a/js/ui/main.js
++++ b/js/ui/main.js
+@@ -430,9 +430,7 @@ function start() {
+     _initUserSession();
+     screenRecorder = new ScreenRecorder.ScreenRecorder();
+ 
+-    if (Meta.is_wayland_compositor()) {
+-        PolkitAuthenticationAgent.init();
+-    }
++    PolkitAuthenticationAgent.init();
+ 
+     _startDate = new Date();
+ 
+diff --git a/js/ui/polkitAuthenticationAgent.js b/js/ui/polkitAuthenticationAgent.js
+index 5f0b55c387..e9ac7b8853 100644
+--- a/js/ui/polkitAuthenticationAgent.js
++++ b/js/ui/polkitAuthenticationAgent.js
+@@ -35,6 +35,7 @@ const PolkitAgent = imports.gi.PolkitAgent;
+ const ModalDialog = imports.ui.modalDialog;
+ const CinnamonEntry = imports.ui.cinnamonEntry;
+ const UserWidget = imports.ui.userWidget;
++const Main = imports.ui.main;
+ 
+ const DIALOG_ICON_SIZE = 64;
+ 
+@@ -389,5 +390,22 @@ AuthenticationAgent.prototype = {
+ }
+ 
+ function init() {
+-    let agent = new AuthenticationAgent();
++    try {
++        let agent = new AuthenticationAgent();
++    } catch(err) {
++        if(!(err instanceof Error)) {
++            err = new Error(err);
++        }
++
++        log('polkitAuthenticationAgent: init error ' + err);
++
++        let icon = new St.Icon({ icon_name: 'dialog-warning',
++                                 icon_type: St.IconType.FULLCOLOR,
++                                 icon_size: 36 });
++
++        Main.warningNotify(_('Unable to start Cinnamon PolicyKit Agent'), err.message +
++                           "\n\n" +
++                           _("If you have another PolicyKit Agent configured to autostart, it should be disabled."),
++                           icon);
++    }
+ }
diff --git a/gnome-extra/cinnamon/files/cinnamon-pillow-10-support.patch b/gnome-extra/cinnamon/files/cinnamon-pillow-10-support.patch
deleted file mode 100644
index c16db71c2e07..000000000000
--- a/gnome-extra/cinnamon/files/cinnamon-pillow-10-support.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-# https://github.com/linuxmint/cinnamon/issues/11746
-# https://github.com/linuxmint/cinnamon/commit/fce9aad1ebb290802dc550e8dae6344dddf9dec1
-diff --git a/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py b/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py
-index 46dd63256a..fde9822dd8 100755
---- a/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py
-+++ b/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py
-@@ -683,7 +683,7 @@ def _on_face_browse_menuitem_activated(self, menuitem):
-             if response == Gtk.ResponseType.OK:
-                 path = dialog.get_filename()
-                 image = PIL.Image.open(path)
--                image.thumbnail((96, 96), Image.ANTIALIAS)
-+                image.thumbnail((96, 96), Image.LANCZOS)
-                 face_path = os.path.join(user.get_home_dir(), ".face")
-                 try:
-                     try:
-diff --git a/files/usr/share/cinnamon/cinnamon-settings/bin/imtools.py b/files/usr/share/cinnamon/cinnamon-settings/bin/imtools.py
-index 2ad0d8ce15..715cf4eb52 100644
---- a/files/usr/share/cinnamon/cinnamon-settings/bin/imtools.py
-+++ b/files/usr/share/cinnamon/cinnamon-settings/bin/imtools.py
-@@ -228,7 +228,7 @@ def create_corner(radius=100, opacity=255, factor=2):
-     draw = ImageDraw.Draw(corner)
-     draw.pieslice((0, 0, 2 * factor * radius, 2 * factor * radius),
-                   180, 270, fill=opacity)
--    corner = corner.resize((radius, radius), Image.ANTIALIAS)
-+    corner = corner.resize((radius, radius), Image.LANCZOS)
-     return corner
- 
- def get_format(ext):
-diff --git a/files/usr/share/cinnamon/cinnamon-settings/modules/cs_backgrounds.py b/files/usr/share/cinnamon/cinnamon-settings/modules/cs_backgrounds.py
-index b6cdaa25c0..156506ac72 100755
---- a/files/usr/share/cinnamon/cinnamon-settings/modules/cs_backgrounds.py
-+++ b/files/usr/share/cinnamon/cinnamon-settings/modules/cs_backgrounds.py
-@@ -628,7 +628,7 @@ def get_pix(self, filename, size=None):
-                             img = Image.alpha_composite(bg_img, img)
-                         img = img.convert("RGB")
-                     if size:
--                        img.thumbnail((size, size), Image.ANTIALIAS)
-+                        img.thumbnail((size, size), Image.LANCZOS)
- 
-                     import imtools
-                     img = imtools.round_image(img, {}, False, None, 3, 255)
-diff --git a/files/usr/share/cinnamon/cinnamon-settings/modules/cs_user.py b/files/usr/share/cinnamon/cinnamon-settings/modules/cs_user.py
-index fef4ef940a..582df385fe 100755
---- a/files/usr/share/cinnamon/cinnamon-settings/modules/cs_user.py
-+++ b/files/usr/share/cinnamon/cinnamon-settings/modules/cs_user.py
-@@ -165,7 +165,7 @@ def _on_face_photo_menuitem_activated(self, menuitem):
-         bottom = (height + new_height) / 2
- 
-         image = image.crop((left, top, right, bottom))
--        image.thumbnail((255, 255), Image.ANTIALIAS)
-+        image.thumbnail((255, 255), Image.LANCZOS)
- 
-         face_path = os.path.join(self.accountService.get_home_dir(), ".face")
- 
-@@ -202,7 +202,7 @@ def _on_face_browse_menuitem_activated(self, menuitem):
-         if response == Gtk.ResponseType.OK:
-             path = dialog.get_filename()
-             image = Image.open(path)
--            image.thumbnail((255, 255), Image.ANTIALIAS)
-+            image.thumbnail((255, 255), Image.LANCZOS)
-             face_path = os.path.join(self.accountService.get_home_dir(), ".face")
-             image.save(face_path, "png")
-             self.accountService.set_icon_file(face_path)
diff --git a/gnome-extra/cinnamon/metadata.xml b/gnome-extra/cinnamon/metadata.xml
index 24e82c1c597d..3eaadcd0d9a0 100644
--- a/gnome-extra/cinnamon/metadata.xml
+++ b/gnome-extra/cinnamon/metadata.xml
@@ -14,5 +14,6 @@
 	</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 cb7716b61800..baa2c4ccad2f 100644
--- a/gnome-extra/cjs/Manifest
+++ b/gnome-extra/cjs/Manifest
@@ -1,6 +1,5 @@
-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
+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 2310 BLAKE2B b09b4b4820cdb836b9c250a0d0984e0c1662abb5e90c8e07ded5f5118e71b06cb3d51ce79ae90d75e1e0839d84dd428021e1bc816b6c914f208a6458264fb6fe SHA512 a2708073cb75af2d9e976e968536ef1465284a21e61f92abcff8d83f3ebb43303f4f09f36f1d2c5b95f822b01a1104e7dfd56f33ffdae5c42410b5d8b398bfc0
 MISC metadata.xml 608 BLAKE2B 7cc55145357fc7b4b46e1a77f19570b60f5dc6207c81efc3b92adf7d5fdb025296d4e6b8b927f193ed7bd0a929274e61c9bdddad2371ca78a497b94fdbe87737 SHA512 672923005e936fd3d08367a8db65318f63217841e6f841623d469c21ce354724f6c2cea853ecca928280b21011d6aa0e133a7830841c9fa44dd8c36402b28066
diff --git a/gnome-extra/cjs/cjs-5.8.0.ebuild b/gnome-extra/cjs/cjs-6.2.0.ebuild
index 1246cf2ca035..05415690462e 100644
--- a/gnome-extra/cjs/cjs-5.8.0.ebuild
+++ b/gnome-extra/cjs/cjs-6.2.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
+EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..13} )
 
 inherit flag-o-matic meson pax-utils python-any-r1 virtualx
 
@@ -13,11 +13,11 @@ 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"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="+cairo examples readline sysprof test"
-KEYWORDS="amd64 ~arm64 ~loong ~ppc64 ~riscv x86"
 
 RDEPEND="
-	dev-lang/spidermonkey:102
+	dev-lang/spidermonkey:115
 	>=dev-libs/glib-2.66.0:2
 	>=dev-libs/gobject-introspection-1.71.0:=
 	>=dev-libs/libffi-3.3:0=
@@ -41,10 +41,6 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.8.0-move_have_gtk4_to_the_appropriate_place.patch
-)
-
 src_prepare() {
 	default
 	python_fix_shebang build
diff --git a/gnome-extra/cjs/files/cjs-5.8.0-move_have_gtk4_to_the_appropriate_place.patch b/gnome-extra/cjs/files/cjs-5.8.0-move_have_gtk4_to_the_appropriate_place.patch
deleted file mode 100644
index 2bb80126507f..000000000000
--- a/gnome-extra/cjs/files/cjs-5.8.0-move_have_gtk4_to_the_appropriate_place.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-# https://gitlab.gnome.org/GNOME/gjs/-/issues/532
-# https://gitlab.gnome.org/GNOME/gjs/-/merge_requests/830/diffs?commit_id=83683d093c157828cf7787e53a32c586ae4e85d3 
-diff --git a/installed-tests/js/meson.build b/installed-tests/js/meson.build
-index 6db887d2250face397079b03d215bbd13f455efb..1e953ceb7695356b6e854775e5db005a9c22e053 100644
---- a/installed-tests/js/meson.build
-+++ b/installed-tests/js/meson.build
-@@ -203,9 +203,13 @@ endif
- # during build should be run using dbus-run-session
- 
- dbus_tests = ['GDBus']
--if have_gtk4 and not get_option('skip_gtk_tests')
--    # FIXME: find out why GTK4 tries to acquire a message bus
--    dbus_tests += 'Gtk4'
-+if not get_option('skip_gtk_tests')
-+    have_gtk4 = dependency('gtk4', required: false).found()
-+
-+    if have_gtk4 
-+        # FIXME: find out why GTK4 tries to acquire a message bus
-+        dbus_tests += 'Gtk4'
-+    endif
- endif
- 
- bus_config = files('../../test/test-bus.conf')
-diff --git a/meson.build b/meson.build
-index 3ac372a16b0bfaa364ed7422119f3e6e4af8971e..5c7703935b68c724347692ef5bf47a3edf868c61 100644
---- a/meson.build
-+++ b/meson.build
-@@ -679,10 +679,6 @@ endif
- 
- ### Tests and test setups ######################################################
- 
--if not get_option('skip_gtk_tests')
--    have_gtk4 = dependency('gtk4', required: false).found()
--endif
--
- subdir('installed-tests')
- 
- # Note: The test program in test/ needs to be ported
diff --git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest
index 43f7a4d6de1e..db824547e991 100644
--- a/gnome-extra/evolution-data-server/Manifest
+++ b/gnome-extra/evolution-data-server/Manifest
@@ -3,10 +3,10 @@ AUX 3.50.2-c99.patch 960 BLAKE2B 32275ec4f28e06965951bfcf7d9dd0393e213d043187974
 AUX calentry.schema 3661 BLAKE2B 0235e8d98d1367f209a31cc74da9563d53dfc12ca34e020f63a18fcb73c13345e58a9e4a9f5bb3e14a7774bdcd279118d84d971a4b164c8ce41cd26798efabdd SHA512 56606848319539b8c9af732a5d572db44e2d7da433b1689ef7f14a283880951e10d5fc39f27245a7ddc8f0cb2e7563a757060020c17e5411f875cae10b119834
 DIST evolution-data-server-3.50.2.tar.xz 4964152 BLAKE2B 7279a5bcb0399fdcce723336a052dca13efa6f0af6ef7371b7cb8e76fbd7e1b0313e7f677cea530de62a93770c35887fd70bac551338f9a89860e2529b1f1519 SHA512 9e2a34e06a446ae142535072a3d6916e31b7be987b114c111fb0687fa32a3fe4085ba5a09ccd77fb395d107e5c673130dc770bae74a50fdb566c91cd9de85610
 DIST evolution-data-server-3.50.4.tar.xz 4964564 BLAKE2B 7e3cf51856a1b12fcbd7e0b6ab98b8616c6e6047afb7fc59f8366920177c30b4d18f58cdd11825e81054ef46d61d3addf9eb646310510ba44f60bc5a2c2abe50 SHA512 e83f4222615d518e536a622808896b1da7e425e90d9b3c3545c6b850f955bd6d4b4a6815904fcdcfa373b3c01a6ce61377e259bc740941fc3f641e60eddacaed
-DIST evolution-data-server-3.52.1.tar.xz 5048124 BLAKE2B 6dd6dc89c7efb7484c075cc51c5e2056ee62a50b810e479f39d04fe62f1a095e49783c20d23372efed954d7f9b78681b7af45389410f2cffb53af8ab2cd22bb3 SHA512 67f08fc3c8f7393fa66dc91f6fb33aa17644eb036d6c3552c3e7b30f128756b9e232cbf2a38eab43d0451699bb8799d9a869198bd9c293c0e2456b8e00339286
 DIST evolution-data-server-3.52.2.tar.xz 5051576 BLAKE2B f4c897fe533e5d8bf13f21e1964b4a300b55e2422b00a2e02e87a1e7a73e82012b7f7719f92a3a7d6e133de9270a776c4ce09ccf8d9cc55e27ee1cb298fa94d6 SHA512 31c0ae52bcf6a96b4d128e39c85a1f1f3cb29f1d7e2ffca3aa0dac95431830e38f2fb1dd3323e77e9e353d260f6681c7f8a55fff421336e152e0902f0085cd34
+DIST evolution-data-server-3.52.4.tar.xz 5055252 BLAKE2B e493f16700533e97440a13dead51bb4654fbbb0345718eeb91e1e052f9599ededacb6e6693fa9de3d68288a6472503ab3a01cab4ac27be8cfc2d693389021aa0 SHA512 2847a15f7cb5b41cce94565a06f7baa02d8dd40241d59029ccebeb21215500ca6f1ac978f1142bde9348917f0534e181e2f7011ed245b6e7a6b1afda9975cfef
 EBUILD evolution-data-server-3.50.2-r1.ebuild 4799 BLAKE2B 7935ddb9a071216bd83fa08c0cee0aadf576e97b43cd065a2f79ce49c304d90d3e5ff82a544d300fe02d3b9dc50a9c243ad29c5d58a25ed927146dad33bb6797 SHA512 6c50ed1e2f36ef7eb267a14621cffd7256a5d99cbe2a3b1229f55680feef178bfceb2385fae9e3d8b0ae7448b8870f7548a211c7d5a9969a102fc1d32e2dcfc9
 EBUILD evolution-data-server-3.50.4.ebuild 4801 BLAKE2B ddd4d7002f1ecf9d7292117e4559fb98d74c4e5abc729538c36ef1f101457ba91bff43d442e3e53de115da10e6f8d20ce94cf617518b3255cfcfd22737842cf5 SHA512 057a12fba2d727dccb23932e4837d1fc05a70d266eb9d4e159e0385142544e47156eac4d5d86ed6a5e312ba2436c688f264d77f5afc673c1dba69c3c3d5bc8bd
-EBUILD evolution-data-server-3.52.1.ebuild 4779 BLAKE2B 937dda417cd1e28f4bc250f0de924f88653e7e9ab23e2d6378101269baa7cd450173c5e110f9108f17d8adff7dd393a7d7f74d041278210cc72c0a711c9c719e SHA512 5c9d14caa8a0dbf66b1dd9d7decb9fff7800df1c4310a9f0964681ac68ec3d39300440d651c76b35d241174c79d0f43923d457d50d7d7011fd800ba76e1233e4
 EBUILD evolution-data-server-3.52.2.ebuild 4779 BLAKE2B 937dda417cd1e28f4bc250f0de924f88653e7e9ab23e2d6378101269baa7cd450173c5e110f9108f17d8adff7dd393a7d7f74d041278210cc72c0a711c9c719e SHA512 5c9d14caa8a0dbf66b1dd9d7decb9fff7800df1c4310a9f0964681ac68ec3d39300440d651c76b35d241174c79d0f43923d457d50d7d7011fd800ba76e1233e4
+EBUILD evolution-data-server-3.52.4.ebuild 4779 BLAKE2B c73fe8adbacdc00ca10ba98a5b82d287b6ba4eda0e56ce8adb6475ec16978d3399d50a45c384423e8da51746950b31714ac8fe79cd0f0f8746be276978c1ca67 SHA512 93ed104f673bb4685ef6d754c296aa8a329b76d716491f3631feef4813f5fce00ce27c7889b200976cc18894ab491ec1d10112b0cbd619bdfd4e58bfcb850c06
 MISC metadata.xml 1315 BLAKE2B 8d9fbe5cab469c2fb34467c7917dcf732b0b3f23869c513d2bce7cfb536912e496d1a42773dd0f64898d476b29e513574087f13411e8e7a310a3f049a7a34efc SHA512 30496793fcb68206bffc475f7b0cefb5f673bcc58e5994c1648dcb6c88696dfd6eda0a62a022a16effcfde829dcce565572b03705426fcd774acde6ad0b940bf
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.52.1.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.52.4.ebuild
index 9782120ba5b7..09cf0682626d 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.52.1.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.52.4.ebuild
@@ -12,6 +12,8 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/evolution/-/wikis/home https://gitlab.g
 LICENSE="|| ( LGPL-2 LGPL-3 ) BSD Sleepycat"
 SLOT="0/64-11-21-4-3-27-2-27-4-0" # subslot = libcamel-1.2/libebackend-1.2/libebook-1.2/libebook-contacts-1.2/libecal-2.0/libedata-book-1.2/libedata-cal-2.0/libedataserver-1.2/libedataserverui-1.2/libedataserverui4-1.0 soname version
 
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
 IUSE="berkdb +gnome-online-accounts +gtk gtk-doc +introspection ldap kerberos oauth-gtk3 oauth-gtk4 vala +weather"
 REQUIRED_USE="
 	oauth-gtk3? ( gtk )
@@ -19,8 +21,6 @@ REQUIRED_USE="
 	vala? ( introspection )
 "
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
 # berkdb needed only for migrating old addressbook data from <3.13 versions, bug #519512
 # glib-2.70 for build-time optional GPowerProfileMonitor
 RDEPEND="
diff --git a/gnome-extra/evolution-ews/Manifest b/gnome-extra/evolution-ews/Manifest
index 9d96088ed1c5..f9134c433062 100644
--- a/gnome-extra/evolution-ews/Manifest
+++ b/gnome-extra/evolution-ews/Manifest
@@ -1,10 +1,10 @@
 AUX 3.50.3-fix-overlinking.patch 2595 BLAKE2B 05c0004e13a304a8643af033094087f5888c8f0b8309f83863c13d1feb3d148ac2776734ab39adcd343c9f57cbd7384aca8df58ce9f6d14af94c250ba29c27da SHA512 5737ab4dbb08e708137caa2089a41eac9ff2d7386fa93a52a43878fb2cb82ccf7d10fb4642988143140e6a33471364431490dcfc0ec696fa6e5d676f8a87f133
 DIST evolution-ews-3.50.2.tar.xz 707800 BLAKE2B 18241eff067658af2f4620af87dea1c9c7c62476bbf9bf259addf15868a3b7e3f156dc952f21af2cad7ba6c2da9fd348b8733e5887f4276ad7eeeca8f9088476 SHA512 9aa4bb023922e39132a0ac3171d95f8362116960aa14dcb961b31ad242e6d7bcf2e946f19aea2c6f9a5324ca0954731264594a27fbb2b0e2cc38eca0cf441108
 DIST evolution-ews-3.50.3.tar.xz 708336 BLAKE2B e8fe4e2a6539142847d6610a61e2f57a83d604946270cd7b23d7e34fa89a38f644a05e452bbc03a6d96553936a38719afb7296eed03c7134735f937943d57114 SHA512 12c7fbe72f375837f185d4c8dbcb2167d327a0ad4b2ca822e4e5349d561e996e7a7405c6f8d36ceeddff0015286117db66a65d2756003aa8ca96948d7826e51f
-DIST evolution-ews-3.52.1.tar.xz 716152 BLAKE2B 91a4ff7ed1b9cb718a42a20bc08b4e12f10caf18534cd72e9f5cbe90161fbeb0af40bf52075a1a83e96f44ed6aac2cc4ad917e1ce49dcc0e26cd56f129b60951 SHA512 24f964019b08261e9b330a1b6663d835e07235e817aea4399c3dab1f35bf4bfb7543f82c91f23f6df6e56e0dff45d1f9ab23362d3603f9a64f6e1c63de75c450
 DIST evolution-ews-3.52.2.tar.xz 721964 BLAKE2B 53962e66f12e660f15c6fb300f30545d2380d5d12a1bce59ba64a44c7cefbdfaee2e1fa319e31e4c4c21cfd462e2c02aa96ee8efe78d4771bd8429aa18e89136 SHA512 b92db18b347c19fab15097aa7cedef876ca13364ece0ff2836cf6160bb2eb2ceb8d7eeaf9bada0369776ea32edca6938952a0dea04b229afd9690c744e16616c
+DIST evolution-ews-3.52.4.tar.xz 724244 BLAKE2B 35b78fa600e06c18cecee8c43941e77b3645a7d4487d72d989da62a0c7acab83f2adf4363c761d7e313f42175f341d63ec7709003599bf5b37e80424cc76d67c SHA512 017dbe28ba6524cdad1582cebd00fb675c75f52cac5875c756be0f402d4a0dd4a83e60b7ee0a2f71211eac49c04bba924e3d71775dce1e55fdcd372b1ac3747d
 EBUILD evolution-ews-3.50.2.ebuild 1581 BLAKE2B 8ab2d02d0d858bcee178981fbf2c969f410d833250d07c0cdd6fccac98402bee1a4036737d4f72db3acace354b8d8253876d15738b500d7252eaae24c8babd6f SHA512 4a22b094baf8b0093e5792b81dccc787771e009a00b9c2c82c0e86bdc7bb9cfad4201dd9fc153160f3890eb09a09e96603c4b0e498ef8b33af53c9b5e8688e3f
 EBUILD evolution-ews-3.50.3-r1.ebuild 1758 BLAKE2B a6a7a1fe2dfd9aaa5308f8af7a62660c7c3be8e080db46ff2536a58ab10132f0cef29789779ceec409569151a639d3b23edab51d73f8d3fac9534bc4d4c40ca2 SHA512 ca4c28177980a3851edba26cd13f773d4b5d2991ad3559d27208bfc6832d3164780238962bead25d06726abd1d19290dca19faee905707df4ef7612442d5fdf8
-EBUILD evolution-ews-3.52.1.ebuild 1518 BLAKE2B 8f82d16c2421efc31df43a5f3d34be9c87f07933aeebbcb2d74a275e3135d3cefcbccff22dbd3bca3a9d128b337a4798160578c623a8bd2b2b3f1e8a3e304e04 SHA512 db0e56bb541f7971410350524bb8a5ddf0d9d55aebbd7336a8494529f7024f0c53362873810a087741fafd3ee2643ff34acd8fb800bcea495e2d4d11ae9c7032
 EBUILD evolution-ews-3.52.2.ebuild 1518 BLAKE2B 8f82d16c2421efc31df43a5f3d34be9c87f07933aeebbcb2d74a275e3135d3cefcbccff22dbd3bca3a9d128b337a4798160578c623a8bd2b2b3f1e8a3e304e04 SHA512 db0e56bb541f7971410350524bb8a5ddf0d9d55aebbd7336a8494529f7024f0c53362873810a087741fafd3ee2643ff34acd8fb800bcea495e2d4d11ae9c7032
+EBUILD evolution-ews-3.52.4.ebuild 1518 BLAKE2B 8f82d16c2421efc31df43a5f3d34be9c87f07933aeebbcb2d74a275e3135d3cefcbccff22dbd3bca3a9d128b337a4798160578c623a8bd2b2b3f1e8a3e304e04 SHA512 db0e56bb541f7971410350524bb8a5ddf0d9d55aebbd7336a8494529f7024f0c53362873810a087741fafd3ee2643ff34acd8fb800bcea495e2d4d11ae9c7032
 MISC metadata.xml 354 BLAKE2B a6cf76e87956f2418a25c83542af3e5efe415943426b03750b2572129b06f977f900207a1eef805b7ae463a84204d12bf286ef9ed0a5b6990cbac2c77783260f SHA512 9f06dce58e2dfdba0a22f8a711d5fc98aba9ae1d130173bd7ef8effd0bb3c1cf046eef712f7ea7bd55c4382ca01e78d7028419ce41812d33ef38a1329978af56
diff --git a/gnome-extra/evolution-ews/evolution-ews-3.52.1.ebuild b/gnome-extra/evolution-ews/evolution-ews-3.52.4.ebuild
index b8536add3667..b8536add3667 100644
--- a/gnome-extra/evolution-ews/evolution-ews-3.52.1.ebuild
+++ b/gnome-extra/evolution-ews/evolution-ews-3.52.4.ebuild
diff --git a/gnome-extra/gnome-calculator/Manifest b/gnome-extra/gnome-calculator/Manifest
index b7826312e87e..5c81f2bcc5bf 100644
--- a/gnome-extra/gnome-calculator/Manifest
+++ b/gnome-extra/gnome-calculator/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-calculator-45.0.2.tar.xz 1100744 BLAKE2B a013985dc6227ae1a3bff30d92740ea4b18765ce5486171a0d0aaf3feae89357f1fe47ede26175a546a01e5b49206a2768de9f5cd62de8f1ee01645bae213614 SHA512 93248846f285badd4ef4303a31cfa6926deb1d37b0ba8ef7b1971795e092c115004c6bb666469a9e8e02a8e55e8f44d34cff6b88c0816888dc42c36fa1148b2e
 DIST gnome-calculator-46.1.tar.xz 1121236 BLAKE2B b6dbd7b0d7cb38f0f9081fcf409b5e7df0d45cfcee5220880d9971066ac9984cb439e74ebc8fa6c73c6c9b7e2ece6aa4db3503da4f5ecab7c5d6fd5b5ca452a3 SHA512 b859a35e614ea5415fbb7a03663f1bf184e7f108882c2093511142d8c067e42f6dd11973cc047552bdd9a74d8ee7e39a00ca42009bea739d2b088b2f90affde1
 EBUILD gnome-calculator-45.0.2.ebuild 1630 BLAKE2B e864bc065d52ef1289963a84107e0a6eef7af4a5ae824755738f0b84459f1711acaf0742a8999fd4c3db9dee47169cbc59090e0307b64880c7e6fd852bc04b5d SHA512 b0dcd0cc05a9f3b27d897d5304f6bbf5f845f9c97907b373aba277fb76273ddb23de3a6d5ed1081b5989b62559fa9d1e90daa5b6b4e10c1938960ad2c5521a30
-EBUILD gnome-calculator-46.1.ebuild 1638 BLAKE2B 0c818690d9f5844a1fbb88320846f3385af8e7610e43ec5dce46e941fbb89786fd928351455c27e689db3e5419a3be77ee2fc9f5613bfd64471a3363d072aee1 SHA512 b67daca91f6279534dcc3977bc60986d93110eb664f43b741ee5057641748aeee8f1abc32e0b43682da7e703f5a46895777b5b458444bcf1e0be60f940ee48c2
+EBUILD gnome-calculator-46.1.ebuild 1640 BLAKE2B b488023e32a0c4efe3d2c680d95d6cfcde915bdb47afd73ba58519e1babf88d0c22bb1bd443ab40df3908ee7cfc85acb6f053c10ce7ad03e72f3546ff6c0637b SHA512 ffac1efaf605ece4592e9c4e2d3d3d12f43c2de4fb55c4758ff98d02e493007903cfeae580f859ec51aebd2b4402709da7f8569438d2f56272251542a24d3ff9
 MISC metadata.xml 553 BLAKE2B adbc4947ab50307c4bf5fca7e9b6cf2db5394b9e3a335d2de56a0678af3f1674d0641835179d2ffad62050292e02874add35125918f922b66fddb64c7e949941 SHA512 960975bcb5b0bdecc83cd80eb8d0d70845a1080a9c2490aa674cf775a44925b9196953a20c88a4197feaf8e8107f98acb6843164292cafb92bde5d1de18242ee
diff --git a/gnome-extra/gnome-calculator/gnome-calculator-46.1.ebuild b/gnome-extra/gnome-calculator/gnome-calculator-46.1.ebuild
index 14c7e6972a5a..6b77a0e6bdf0 100644
--- a/gnome-extra/gnome-calculator/gnome-calculator-46.1.ebuild
+++ b/gnome-extra/gnome-calculator/gnome-calculator-46.1.ebuild
@@ -10,8 +10,8 @@ HOMEPAGE="https://apps.gnome.org/Calculator/"
 
 LICENSE="GPL-3+"
 SLOT="0"
-IUSE="+introspection test"
 KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+IUSE="+introspection test"
 
 # gtksourceview vapi definitions in dev-lang/vala itself are too old, and newer vala removes them
 # altogether, thus we need them installed by gtksourceview[vala]
@@ -36,7 +36,7 @@ BDEPEND="
 	$(vala_depend)
 	net-libs/libsoup:3.0[vala]
 	gui-libs/gtksourceview:5[vala]
-	gui-libs/libhandy:1[vala]
+	gui-libs/libadwaita:1[vala]
 "
 
 src_prepare() {
diff --git a/gnome-extra/gnome-commander/Manifest b/gnome-extra/gnome-commander/Manifest
index 081c8f46e533..f1c42b38468c 100644
--- a/gnome-extra/gnome-commander/Manifest
+++ b/gnome-extra/gnome-commander/Manifest
@@ -1,5 +1,7 @@
 DIST gnome-commander-1.16.1.tar.xz 6240500 BLAKE2B c24b9647f19faa55479e88b11524bc88a1720feffe9a4de638bebbd54aea17a6975d8319eb52281bbc6006907294d86c1f1874eb252a51f9fe5075748f84d24c SHA512 3a42671350e071552f82e44cf09e7598c9851a8d0b47cedc059a23347e8da71e1cc140f16191b31b1e66b74d803240db63a0eb8ba6a189dfc64315783fb954e0
 DIST gnome-commander-1.16.2.tar.xz 6239476 BLAKE2B 56f44428b89ef765bfb976dc3e8084da34844e0056e96afbdaf073265aaf4f87b86c4c2a93fcefe4d07b9fae2be3d72ffa49684dfb0613ee98373d4fac6ef42f SHA512 da2675a6625a67ab873d49f1caf939c30a317ecc0cb9b15c794b27c4a46dfba4cdea10266b380ef1e6809329ee770db4d7559a9cf94b575340b7fe4bb997d6c2
+DIST gnome-commander-1.18.1.tar.xz 6244688 BLAKE2B a903a82c76a064e33320ffdd52563df5e05d42d9aa1dd42f97ba36b2569e6bff68a5581dae9c819d6f1b93f544b5f543e7859c7c4a8f0639f2d3175961503bb3 SHA512 6715538fd913d2167fa70feba48106b3bff8b17185df2590b490633c628995295d6e17c953d449537ddfe4a48ea3be0ce6e1cc82be0f6db7b26c91f29e4a418e
 EBUILD gnome-commander-1.16.1.ebuild 1274 BLAKE2B c56a7bf65a871cc45bd8cec9ef5df05e766e640d641811c8dafead35fd5f8a246726ea94af18e26c22c321ab3ef64b85f3843a7a00227b66443206b7f21d9b55 SHA512 477757d113f59dbf04a1d8c495166ddf0bd2e8805c3e3871207c44d45feb37295ffa6e5a9ac47950b054a0518779510db76855ab94453727e5e0c12af2adbdcd
 EBUILD gnome-commander-1.16.2.ebuild 1283 BLAKE2B ee87ddfdbb0b73877eb1145d57b11868fe2a54d652334b0e5221b19d6172ac9ebee1a967cadd2b54c5cd44865e142a79e6b1a4e541e1edc34bb5da601f424cf5 SHA512 246ea3bca76d617b140b35dff683e55236841ef567e5dceb51ee11573840538869def9ed81d3b7d427cafb84dab0bb45f02ed6b9a474ff18bb8cbd353d1ae56f
+EBUILD gnome-commander-1.18.1.ebuild 1263 BLAKE2B 60e5cbc2efe2855470fb6e0bdccfc2b3c9a08071f5b4faace759a0f88f1c33b84e8711811e5987feb129982744244a691ac33f770bf2ddb37a5c9b48d3777f10 SHA512 b220e6b475b8a945924cec8588ee2b2088adee17efe10b4865dc1a87bfa239f2607b17250849f15358f2bf2761ee640dfe9916ea1ba89ee2d58ebbfb898efc77
 MISC metadata.xml 948 BLAKE2B 2ea88ff9c2531e373cf0dc514c0e27fc48abe4617ed8ee0cf7ffc9970959908a65be67aa6910528f5dd41636e32db4d3ded7cad46d34f86cd9fd350970eed3c1 SHA512 7058510cec87b1ba608fecc1cd748b2caf5f7802a13288d631634a3b0ea6c5daa7ab3b3b17987140aec779f58436924bb19765471a0a3b1ea9afba1b5a2b3ea6
diff --git a/gnome-extra/gnome-commander/gnome-commander-1.18.1.ebuild b/gnome-extra/gnome-commander/gnome-commander-1.18.1.ebuild
new file mode 100644
index 000000000000..0bf6498899f3
--- /dev/null
+++ b/gnome-extra/gnome-commander/gnome-commander-1.18.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome2 meson optfeature
+
+DESCRIPTION="A graphical, full featured, twin-panel file manager"
+HOMEPAGE="https://gcmd.github.io/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc exif gsf pdf samba taglib test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	doc? ( gnome-extra/yelp )
+	>=dev-libs/glib-2.70.0:2
+	>=x11-libs/gtk+-3.24.0:3
+	exif? ( >=media-gfx/exiv2-0.14:= )
+	gsf? ( >=gnome-extra/libgsf-1.12:= )
+	pdf? ( >=app-text/poppler-0.18:=[cairo] )
+	samba? ( gnome-base/gvfs[samba] )
+	taglib? ( >=media-libs/taglib-1.4 )
+"
+BDEPEND="
+	doc? ( app-text/yelp-tools )
+	dev-util/glib-utils
+	dev-build/gtk-doc-am
+	app-alternatives/lex
+	>=sys-devel/gettext-0.19.7
+	virtual/pkgconfig
+"
+DEPEND="
+	${RDEPEND}
+	test? ( >=dev-cpp/gtest-1.7.0 )
+"
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature exif exiv2)
+		$(meson_feature gsf libgsf)
+		$(meson_feature pdf poppler)
+		$(meson_feature samba)
+		$(meson_feature taglib)
+		$(meson_feature test tests)
+		$(meson_use doc help)
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	optfeature "synchronizing files and directories" dev-util/meld
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+}
diff --git a/gnome-extra/gnome-software/Manifest b/gnome-extra/gnome-software/Manifest
index 58456e0782c5..987ebabcd530 100644
--- a/gnome-extra/gnome-software/Manifest
+++ b/gnome-extra/gnome-software/Manifest
@@ -1,7 +1,5 @@
-DIST gnome-software-45.3.tar.xz 2477736 BLAKE2B 82a12e4d22e28c6c6345ae654f97911cdfeeff658dc3fbea68df949856c4552520edc6fc5f67d19fcfd85af88eb6d285561ddc294938ce753ffbc05a8b703398 SHA512 45c8c92c9bd046b37b3fb4e817a0ea83fe9323d019f86140357f90bb2a0bf9dda5d33798c4b4d78303e2402c6cb603a4ff467e260e734b7ba97f07ebfaf4044c
-DIST gnome-software-46.2.tar.xz 2574280 BLAKE2B 30ad2dfeebc1477f9917604eb5749f45b04770322de5660fe8661ea4df4df2699854f2fcc18349ba54c62a9af2c0a47e070f152e88b9bffece40f8e6d5be6ef2 SHA512 4e7cccc20001ccee114508bb50e2a25968ee6fea64fb545e1174ff435cd368b2d7c928b6a182874af8e9f0c99f9f506e75c5ac9bf61b35ba0a897368ae0abc3c
 DIST gnome-software-46.3.tar.xz 2574916 BLAKE2B 017ef6b463a103b87e3935ba236179ecba2e4530c65986bbe6451109122e2ad02715bf12d0cff4459ef2211a3debd1d4dfb566e295e4ade4e93096bae308b982 SHA512 dae91ae3fa9737bf496623663e709b6251ec1390692ab34f556c2cf8efbfb330e45a9824c93c62e37a2f673bec42e9a09025ae69b8e3cb1d942ec8574e04c51c
-EBUILD gnome-software-45.3.ebuild 2621 BLAKE2B 745b17d6177c4edd5a558c28ee129528a2a18bd61ec20de909ae34d3dc56bd8467a8f82f9edea1120c21f9f8aed1ff5b85368df71dbf0b527a7dc2594d73aa84 SHA512 dc5437e80e458869c431c01f312dd79c5bd9e05a527e1a1c53c991456646caa51d5062a9c0ae27b7c211788bbf37feab12ced61be4db88e1c4cdde80cdd1bb13
-EBUILD gnome-software-46.2.ebuild 2723 BLAKE2B ee11e0c8dc80f1b2aba435d5a6bbe3362867901d7ac9905e203c4b7de73be83a4b40f1632538261cfb39177640e7dab965733308f8dd6f1fabdaa33048c6a44a SHA512 901c008b2a5d9c0362d3be65227564f47fa8224c11ebf18af6f1f417dc9e68567170e74b26da240cf9d7880947e5b2bdde89641b97f1c0e12670446472a842b5
+DIST gnome-software-46.4.tar.xz 2575200 BLAKE2B bc5af24e0b71f279c26b83c3808bb5ee4e41d405d9a5370f7f37b3f19aab0043b338a1f3212ad74e6cfe02794ec16ec88b222322eb27190c0863a0ac5b88b3fa SHA512 148cdb3d3b3b0d74e00adcc066cf85fc20f86d9196def5132dfbb7b579464abe12c199d7f45b289d980ea634ddbce677be7588e2600a5f08ccd4630276a78799
 EBUILD gnome-software-46.3.ebuild 2723 BLAKE2B ee11e0c8dc80f1b2aba435d5a6bbe3362867901d7ac9905e203c4b7de73be83a4b40f1632538261cfb39177640e7dab965733308f8dd6f1fabdaa33048c6a44a SHA512 901c008b2a5d9c0362d3be65227564f47fa8224c11ebf18af6f1f417dc9e68567170e74b26da240cf9d7880947e5b2bdde89641b97f1c0e12670446472a842b5
+EBUILD gnome-software-46.4.ebuild 2723 BLAKE2B ee11e0c8dc80f1b2aba435d5a6bbe3362867901d7ac9905e203c4b7de73be83a4b40f1632538261cfb39177640e7dab965733308f8dd6f1fabdaa33048c6a44a SHA512 901c008b2a5d9c0362d3be65227564f47fa8224c11ebf18af6f1f417dc9e68567170e74b26da240cf9d7880947e5b2bdde89641b97f1c0e12670446472a842b5
 MISC metadata.xml 788 BLAKE2B 0093b639ef68b32b6d6f4c4b81a5e61cd0940da6c00a363fdcdfc1431d7bc3eb3b493dc2d72dea1e5011b1c9c333cd030519e7ec6320d32092249573d772b54d SHA512 cbc4f4573f3892f2c4ecf6ab3a79d49f7c4fc5dd8b0d3d4873a460fb6742d7f1e1a05c48b232cdec03e5c4abef5693134dcc21411490de68725cb0945423eeee
diff --git a/gnome-extra/gnome-software/gnome-software-45.3.ebuild b/gnome-extra/gnome-software/gnome-software-45.3.ebuild
deleted file mode 100644
index 029c629a83c8..000000000000
--- a/gnome-extra/gnome-software/gnome-software-45.3.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit gnome.org gnome2-utils meson virtualx xdg
-
-DESCRIPTION="Gnome install & update software"
-HOMEPAGE="https://apps.gnome.org/Software"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~loong ~x86"
-IUSE="flatpak +firmware gnome gtk-doc sysprof udev test"
-
-RDEPEND="
-	>=dev-libs/appstream-0.14.0:0=
-	>=x11-libs/gdk-pixbuf-2.32.0:2
-	>=dev-libs/libxmlb-0.1.7:=
-	>=gui-libs/gtk-4.10.0:4
-	>=dev-libs/glib-2.70.0:2
-	>=dev-libs/json-glib-1.6.0
-	>=net-libs/libsoup-3.0:3.0
-	>=gui-libs/libadwaita-1.3_rc:1
-	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 )
-	gnome? ( >=gnome-base/gsettings-desktop-schemas-3.18.0 )
-	sys-auth/polkit
-	firmware? ( >=sys-apps/fwupd-1.5.6 )
-	flatpak? (
-		>=sys-apps/flatpak-1.14.0-r1
-		dev-util/ostree
-	)
-	udev? ( dev-libs/libgudev )
-	>=gnome-base/gsettings-desktop-schemas-3.11.5
-"
-DEPEND="${RDEPEND}
-	test? ( dev-libs/libglib-testing )
-"
-BDEPEND="
-	dev-libs/libxml2:2
-	dev-util/gdbus-codegen
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	gtk-doc? (
-		dev-util/gtk-doc
-		app-text/docbook-xml-dtd:4.3
-	)
-"
-
-src_prepare() {
-	default
-	xdg_environment_reset
-
-	sed -i -e '/install_data.*README\.md.*share\/doc\/gnome-software/d' meson.build || die
-	# We don't need language packs download support, and it fails tests in 3.34.2 for us (if they are enabled)
-	sed -i -e '/subdir.*fedora-langpacks/d' plugins/meson.build || die
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use test tests)
-		$(meson_feature gnome gsettings_desktop_schemas) # Honoring of GNOME date format settings.
-		-Dman=true
-		-Dpackagekit=false
-		# -Dpackagekit_autoremove
-		-Dpolkit=true
-		-Deos_updater=false # Endless OS updater
-		$(meson_use firmware fwupd)
-		$(meson_use flatpak)
-		-Dmalcontent=false
-		-Drpm_ostree=false
-		-Dwebapps=true
-		-Dhardcoded_foss_webapps=true
-		-Dhardcoded_proprietary_webapps=true
-		$(meson_use udev gudev)
-		-Dapt=false
-		-Dsnap=false
-		-Dexternal_appstream=false
-		$(meson_use gtk-doc gtk_doc)
-		-Dhardcoded_curated=true
-		# TODO: Will this be beneficial to us with flatpak at least? If
-		# enabled, it shows some apps under installed (probably merely due to
-		# /usr/share/app-info presence), but launching and removal of them is
-		# broken
-		-Ddefault_featured_apps=false
-		-Dmogwai=false #TODO?
-		$(meson_feature sysprof)
-		-Dprofile=''
-		-Dsoup2=false
-	)
-	meson_src_configure
-}
-
-src_test() {
-	virtx dbus-run-session meson test -C "${BUILD_DIR}" || die
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/gnome-software/gnome-software-46.2.ebuild b/gnome-extra/gnome-software/gnome-software-46.4.ebuild
index fc51a767d046..fc51a767d046 100644
--- a/gnome-extra/gnome-software/gnome-software-46.2.ebuild
+++ b/gnome-extra/gnome-software/gnome-software-46.4.ebuild
diff --git a/gnome-extra/gnome-system-monitor/Manifest b/gnome-extra/gnome-system-monitor/Manifest
index 5ddcb8a1237b..1209fb86242b 100644
--- a/gnome-extra/gnome-system-monitor/Manifest
+++ b/gnome-extra/gnome-system-monitor/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-system-monitor-45.0.2.tar.xz 1020000 BLAKE2B 9c35175e9b71fa9ea4689fdd17f8a7b9f251fc9039db6d89d6d05fa6fb2729ecce20c5d0f4a000f2f8a3eaa63026053a14a8681e62d8a5af9e589e230bd18026 SHA512 60c65a4e035d82bdae98622ed113ba26b45491c7e31358a138a6e4029a08448671190bf8eaf9bb1d30468a4cc00de7565ac25f0b93ac9c3ecee2fcb0515c62f7
+DIST gnome-system-monitor-46.0.tar.xz 1041848 BLAKE2B 29d87d6621538f7c0e0778eb7c598ac69bc52d05c5ce481e3d22d87cc540830481d34dccc992e44b59556104f567eeba9375d802418c371501994039065c0838 SHA512 2bba46bf5f03d4b8ad6e45e42b2d7ce21859037a1bd386ea17276d10c0eba506c718ab5bc4c203823cabd830bdaac3d61753dbb3b364eaf4dfea0031fea0ac27
 EBUILD gnome-system-monitor-45.0.2.ebuild 1225 BLAKE2B 902534021c989bf04e0b37211614f12deb54d9da713ac98cdcd621e4472e95f03374fd0095956d6c958d185fb4465ccd0ca1011c83cd12f73ebfe097fe5fcaa0 SHA512 8072b594fbafd043ef7236f96f3675b2d47f150b00140f539c5158b544e0062b1d5f176611fb55a957221a7d37bec2a7d1f7cc83464dc1daeaf00e7564de7040
+EBUILD gnome-system-monitor-46.0-r1.ebuild 1199 BLAKE2B c9ff40636eafd32a682fd4c8ced8f47f99ca1c5b29fa7e2005f5674e0389b85b67c1c368d6517ec55ab52160b75d2cd08178c37490c923d65ca252eba1f81e4a SHA512 2a3206573c216fddb77a3164a0c8cee59ff7de5f53f2536efc6e121170eed53a85d58477c9f7ed3afe192d2098204d9bb5d81f8184418798455c6da4764bcd02
 MISC metadata.xml 495 BLAKE2B 56ac029a06b0bc1f2b240c372426b6002c411005109f12c166227f3689bf0470326f810bdcfa62d5e34077710156e085d7f933bdcb1b26acbb8670cb46362d94 SHA512 0936f40a28b66e92a2468c926b05000aefb7e55cd724ec24f69e9c5ff517aa4604bbb03899fe104600218617e881e45f72bd0ab9c668313b6545cc931fd6b981
diff --git a/gnome-extra/gnome-system-monitor/gnome-system-monitor-46.0-r1.ebuild b/gnome-extra/gnome-system-monitor/gnome-system-monitor-46.0-r1.ebuild
new file mode 100644
index 000000000000..ab5d8c1590c9
--- /dev/null
+++ b/gnome-extra/gnome-system-monitor/gnome-system-monitor-46.0-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit gnome.org gnome2-utils meson xdg
+
+DESCRIPTION="The Gnome System Monitor"
+HOMEPAGE="https://apps.gnome.org/SystemMonitor/"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+
+IUSE="systemd X"
+
+RDEPEND="
+	>=dev-cpp/glibmm-2.68:2.68
+	>=dev-libs/glib-2.56.0:2
+	>=gui-libs/gtk-4.12.0:4[X(+)?]
+	>=dev-cpp/gtkmm-4.0.0:4.0
+	>=gnome-base/libgtop-2.41.2:2=
+	>=gui-libs/libadwaita-1.4.0:1
+	>=gnome-base/librsvg-2.46:2
+	>=dev-libs/libxml2-2.0:2
+	X? ( >=x11-libs/libwnck-2.91.0:3 )
+	systemd? ( >=sys-apps/systemd-44:0= )
+"
+# eautoreconf requires gnome-base/gnome-common
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	>=sys-auth/polkit-0.114
+" # polkit needed at buildtime for ITS rules of policy files, first available in 0.114
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use X wnck)
+		$(meson_use systemd)
+		-Ddevelopment=false
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/gnome-extra/gnome-tweaks/Manifest b/gnome-extra/gnome-tweaks/Manifest
index d41b8c197711..42d5897824b7 100644
--- a/gnome-extra/gnome-tweaks/Manifest
+++ b/gnome-extra/gnome-tweaks/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-tweaks-45.2.tar.xz 738788 BLAKE2B 55c0cc91d137dab1d39701660e6be987b87957601c9c315599eac4b0d4e478a7c07bd0fe24d8ce72a7c3224c6a466dcdd5608adde28527b3ff31865c90399b3a SHA512 b07d99f53de990de04f1d2aefed932633253cb2584d719bdd7bb197e431d622e777f911bc3f454a336e0fce3bf93a8ae55744b09e99e9f014d244bf82e5118f9
 DIST gnome-tweaks-46.1.tar.xz 691844 BLAKE2B ffb2522139bb96a48aacaedd713d3bd8c3e2fc87416e6ca66e71d856996364e32cc2417ab71119903f175e42c060fb46405aaf47fd34222cc4b853cfb82bac84 SHA512 8e167a84cc2eb700fe098cf7221bb3f8a3cc039826e1267e5585b5362862e4626dea3c84dfb8ccc9d08b34d2894422ca8505623148415116423738d2c07956f3
 EBUILD gnome-tweaks-45.2.ebuild 1216 BLAKE2B ad9b623bb666517f549587da3caf6cf2115fa266cb97b7e60045a0dba756ddd98ff9d7559fb5c07372cb0b53368b030d16bf9eca8f8f2c350be6510f160101ba SHA512 ff8255f0a2be5b8a723afc336614fbd7fcc3d0ceae1623771291bda123317092abd39bc9abf5e553322b1b8669c34bf339396412071dc926d2a6868b63bd55d4
-EBUILD gnome-tweaks-46.1.ebuild 1288 BLAKE2B 48ce04e5919c21b68c15d5411bf10e1a1b7e9eed0dc8563cbcd5b4b891d435a39d8040aeef48cbeb7dba91d0ff2022f9ebd2d942a53d95bdff50a219e5ed9082 SHA512 333d3a12105d7e1b322161d4cdf1db8140c09fc45c5de66b0bb5f3b2ed8c8020fb36484db93e94d0c029429a2a22bae2d57870ddeb7855b4532d5a0a925a3d7c
+EBUILD gnome-tweaks-46.1-r1.ebuild 1313 BLAKE2B 5ac1652e4129472be9c34f74dd51881af5c0e547def1cf67091aff6f372b436e5478cfed9cf584f4a341e43c762a9dbc2b62e335c90b92d6b90f3201b97b55ea SHA512 c30d19a575f110820b6660cb149ec3f3038013b723fe860657a4f90ebaa6cbfb7708c72976d57516bd983363ae8b45bcb8fa42815fa02967972d2e2187ea077c
 MISC metadata.xml 680 BLAKE2B 0262d35712bb1b29428738120e961ed7128b381ed0f0ced9546d35fcbdff179575906b910055ec3e616d7bf7860c4d1f0d66c50aded1500c9f24ba9ad0c34c1b SHA512 16ae57ccf79658fd5a717f7fbad121ba5f48f0bd63ad882e1055897d14eec3ca3dd6467179110689066ddde0d21f1c3f12fcf46f97dc81dc9091d758d37a0913
diff --git a/gnome-extra/gnome-tweaks/gnome-tweaks-46.1.ebuild b/gnome-extra/gnome-tweaks/gnome-tweaks-46.1-r1.ebuild
index fb6005959b12..437deacb4ced 100644
--- a/gnome-extra/gnome-tweaks/gnome-tweaks-46.1.ebuild
+++ b/gnome-extra/gnome-tweaks/gnome-tweaks-46.1-r1.ebuild
@@ -28,12 +28,12 @@ RDEPEND="${DEPEND}
 	>=dev-libs/glib-2.78:2
 	>=dev-libs/gobject-introspection-1.78.0
 	>=gui-libs/gtk-4.10.0:4[introspection]
-	>=gui-libs/libadwaita-1.4.0
-	>=dev-libs/libgudev-238
-	>=gnome-base/gnome-desktop-3.30:3[introspection]
+	>=gui-libs/libadwaita-1.4.0:1[introspection]
+	>=dev-libs/libgudev-238[introspection]
+	gnome-base/gnome-desktop:4
 	x11-libs/libnotify[introspection]
 	x11-libs/pango[introspection]
-	>=gnome-base/gsettings-desktop-schemas-46.0
+	>=gnome-base/gsettings-desktop-schemas-46.0[introspection]
 	>=gnome-base/gnome-shell-3.24
 	x11-wm/mutter
 "
diff --git a/gnome-extra/nautilus-dropbox/Manifest b/gnome-extra/nautilus-dropbox/Manifest
index 1d7aeec69b4a..fd6413472e58 100644
--- a/gnome-extra/nautilus-dropbox/Manifest
+++ b/gnome-extra/nautilus-dropbox/Manifest
@@ -1,6 +1,7 @@
 AUX nautilus-dropbox-2019-system-rst2man.patch 464 BLAKE2B c0f25a56ee504a6070efdae70670e1a925a1718cfb5e1345d3acfdb0face02d1278d10f2f7172e172056834f99f309d50bbf5899f37fa6023e743042f6ffd7b8 SHA512 98c9e85a491991fd2afee3a12c8be4ab708ee47a42d08d4a11daefc1e964cb3031ffb94a27ab7758b3f1c71f7343dd4b0a49d24cb8aa2848baf65f83879a6cfb
 AUX nautilus-dropbox-2020.03.04-nautilus43.patch 13896 BLAKE2B f4925ecae7a0850c65c0e19b4cbdbaa1973c180fe1c70ea4aa36dcd30603f416db07542af908dfb4dc2a43ed06ece1ac4d0c652b6c724fc4b4e21b9085cd8381 SHA512 fc6e0c5adaab8e3dd33a8ab89bf3d21a461d7e6fdcaa69c86f0bf8a3739f93d3243d3fe42d3730309991be27d97062aadbe4b18994ddc6b488f783172ad34e64
 DIST nautilus-dropbox-2020.03.04.tar.bz2 387351 BLAKE2B ff25716ef10759e014cffec8a7e9b1a40931686d6de3c69e9060c77cbf3aee65ffeed91ba809ba8cffc372f284180c74a8cb5b0ca4b342aa137d9e574a2a1abf SHA512 8f26165a48d1767b3bccb34f95f19357e8fd209f383270ac2d40f773df139d640c3fb33db28cf1fa7e2d7063a7a37b15ed7f4f22f85019e05885c097cea39a48
+DIST nautilus-dropbox-2024.04.17.tar.bz2 394725 BLAKE2B e617f02fcb6c11fd6937a99c0e2faaebd564d533e6ed44fc0492504fb41612fb297b3c98c84b8c3ecc314e33b27a820e8b655bc6ae92de43ffbb2f4e4d370f9f SHA512 43b7a0eaf3b7ebc35fa21a5d11dc1089b62fd0a414079a55fbb4ef7cb8211923123c46bec06c3b73eacd5897b7b8b2ae336de7b15750f0802eb28a23ec9e56bd
 EBUILD nautilus-dropbox-2020.03.04-r1.ebuild 1542 BLAKE2B 1b8697fa3f848932a1bb54861ff869c460ab6ef73dad90fc2f90490b37989a657a5228d8cf50fd9ff5e12f63b035acb70b5a621ef0aeed42caabddc24b512fae SHA512 d283e55bbf7850a4a5ebd738f722dcf513a6eb015b8f05942a46867d14e8958435deb2e2c392076b5ed2d4f2fce394d2d1ecccf20f67c63a269d7a3b9dac07f4
-EBUILD nautilus-dropbox-2020.03.04.ebuild 1380 BLAKE2B 08647f4a124ad0227114e7174337dbea49ff5c1417057671543406029a3b7cbff3d99167a438f610100a2fec96fb5aaafe6d7f2fea7fccaa5bef1d1629a78e9d SHA512 987c163426c5d52a5135a48806296dc4c8131b797d97db58492288ee5d7bf69d491a1a655ab1bde1acd307be6ad08eabce12ef4883e27fd3c016757a66f8d8fa
+EBUILD nautilus-dropbox-2024.04.17.ebuild 1377 BLAKE2B a60062a07b8a34ec968038fdd555d5ff16877fd51359993fd6a6cb187d8d8a54c353a87058d478d12271e204949d200bac9da0467262dbc8ab9c638fb33183e5 SHA512 84db111a09c30273ce6718a68838bf31dc487652527c291731842642946466403f8213041cb507738d951e7b210851874a5c5ef65290a78da537174a84b9e0ab
 MISC metadata.xml 672 BLAKE2B 65a39d3019fb146357a8385c3a254919a12b65b58b2ce6e848c5dc9a1a404998247c48c48ad277f5c9ea741e72fdca87bc3aeff6373843bd635c17a0a031373d SHA512 1f4db8e346875512dcc88931f10eaa10a1b1f4c30413640c3e0581fa8e6ca6dfd82e9812ab9e01dce29ec98fbbdf5fb6a19e153ae3b9a954b3a35c85932a083f
diff --git a/gnome-extra/nautilus-dropbox/nautilus-dropbox-2020.03.04.ebuild b/gnome-extra/nautilus-dropbox/nautilus-dropbox-2024.04.17.ebuild
index 92ad475a3d25..b9be5584638e 100644
--- a/gnome-extra/nautilus-dropbox/nautilus-dropbox-2020.03.04.ebuild
+++ b/gnome-extra/nautilus-dropbox/nautilus-dropbox-2024.04.17.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
+EAPI=8
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{10..12} )
 
-inherit autotools python-single-r1 xdg-utils
+inherit autotools python-single-r1 xdg
 
 DESCRIPTION="Dropbox Nautilus Extension"
 HOMEPAGE="https://github.com/dropbox/nautilus-dropbox"
@@ -21,15 +21,21 @@ RDEPEND="
 	${PYTHON_DEPS}
 	$(python_gen_cond_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]' )
 	dev-libs/glib:2
-	gnome-base/nautilus
-	net-misc/dropbox"
+	gui-libs/gtk:4
+	>=gnome-base/nautilus-43
+	net-misc/dropbox
+"
 DEPEND="${RDEPEND}"
 BDEPEND="
 	$(python_gen_cond_dep 'dev-python/docutils[${PYTHON_USEDEP}]' )
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
 
 # use system rst2man
-PATCHES=( "${FILESDIR}/nautilus-dropbox-2019-system-rst2man.patch" )
+PATCHES=(
+	# use system rst2man
+	"${FILESDIR}/${PN}-2019-system-rst2man.patch"
+)
 
 src_prepare() {
 	default
@@ -54,12 +60,6 @@ src_install() {
 	# removes files which conflicts with system dropbox
 	rm -r "${ED}"/usr/share/applications || die
 	rm -r "${ED}"/usr/bin || die
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
 
-pkg_postrm() {
-	xdg_icon_cache_update
+	find "${ED}" -type f -name '*.la' -delete || die
 }
diff --git a/gnome-extra/nemo-fileroller/Manifest b/gnome-extra/nemo-fileroller/Manifest
index d83320736657..917895e41845 100644
--- a/gnome-extra/nemo-fileroller/Manifest
+++ b/gnome-extra/nemo-fileroller/Manifest
@@ -1,5 +1,5 @@
-DIST nemo-fileroller-5.8.0.tar.gz 535979 BLAKE2B e43433d1ac720d9dfb5d190f3b8d4e5f482caaffa29bfb2249cb4f51fa76e911c9e14237b08970f7910b70c328e35047271ad7f21521ed49a98979489e98f72a SHA512 cc1015c0c4379a6ca6a9f23931da5e4e1429e13026965a95cab6ce3b52ca28c07bd5be343cdcef0d9c128ecdd27f2a04d9dc1fc47cf51ce7e5102124ccd0ce39
 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
+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 575 BLAKE2B a5acfeee6f81e0728e01efdc391381edb569915ba9f75e227512a738271bb9bc72aed0124956ae18a1d50e9c33d1a585de4aa685cf6e9c9ddca0e5d47acc86e5 SHA512 6565383a1fcfbd5b48d454089e54db80d25b165eb0a0cdc64a9760631088748fc1be467cac6dc3e639f6814e45265cb2addb6e8f3f8762a5eb695c51ed6af6cb
 MISC metadata.xml 495 BLAKE2B 448c4a1b019897c3d8098b970e31849035b0125b707ac744eb668f7d295c76de0f121235edd1e76dc931051ccee1a508897679845dadfea04baf3d832baac5a5 SHA512 c86fa92ffb7d82826c4188c1ac63131fce88b40f5b9e13e2ef3162b3c83cc2d7cb6968c0e3e894a93e685cac818b7284072c55a4e8114dd44636a4678c415702
diff --git a/gnome-extra/nemo-fileroller/nemo-fileroller-5.8.0.ebuild b/gnome-extra/nemo-fileroller/nemo-fileroller-6.2.0.ebuild
index db5fd3b0dd5d..8c6bddbcc999 100644
--- a/gnome-extra/nemo-fileroller/nemo-fileroller-5.8.0.ebuild
+++ b/gnome-extra/nemo-fileroller/nemo-fileroller-6.2.0.ebuild
@@ -1,17 +1,18 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 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"
+S="${WORKDIR}/nemo-extensions-${PV}/${PN}"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 
 DEPEND="
 	>=dev-libs/glib-2.14.0:2
@@ -21,5 +22,3 @@ 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 2600db21f2ce..21f021e52cea 100644
--- a/gnome-extra/nemo/Manifest
+++ b/gnome-extra/nemo/Manifest
@@ -1,7 +1,7 @@
 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-5.8.4.tar.gz 1506620 BLAKE2B 948735bf75df2a0f8be9f5ddb29a73d6bf5127a6d932325855976da21334feb2c905b1a26c0ef285c8317b7e42223de098505802b1dde7a5e6fc1f4942d11681 SHA512 b636d5bbaa18e9259f74f086ed55e528be8dcfabdddbcdb0e3c82e3b93d0aa1b77573319f83df1529f1c473cdabbcab7280baa4169b482b5b9ecf6ade6e04427
 DIST nemo-6.0.2.tar.gz 1480887 BLAKE2B d1e3892938cb81bcb676626a9ef54362939d522a6d09befe25dd77a236a7eee3e06461da1855317bff2a5f201bc142903ce085bfbafdbddca0700a177221ccdf SHA512 05e8a6ab785f527ad61c1fe57d372ae8ea8f77d27ec8608d38e99f5f0f9065aecef4b84d1b016b682d14320d7099806d5672a101c0a370429d1c3f2a341fed1c
-EBUILD nemo-5.8.4.ebuild 3137 BLAKE2B 6d5cc7a56517cddd50b959ed39e40112e742ba4b48be34635d0c1504eb5070ef9901a57ab62cb1912d5af5d4d983ae355704e3fd7682d097a9271bf1a43dc8ea SHA512 448ce11da464b5c9c0edcde8707cdff6e323b3b1d47314a9bb11a7b2f7eb4f979351c8746d3e1762a21199c3199d13b707616ead9414a42976701f4a0cd9c21b
+DIST nemo-6.2.6.tar.gz 1503182 BLAKE2B a8c469a6ebcb297e4cd2f8b3e9a07cb7fe6b7f399747c798a5b23ca930d8375275fc66b6d05ab78b660ec7b250f413ca0a16ba7ccdf46c0e93ad18d19839a969 SHA512 62a0d6a233f57fa3e9a078c3c90f7c735bf58aee4a37cfebdda20569f0b692e33998719152060e963b27dabee5a5a3da1c0d71a2b51dc5bf200331fd16b93135
 EBUILD nemo-6.0.2.ebuild 3298 BLAKE2B 0b05154d8ee7cfc59bee22e3699fea029c1c54ab144b67d86055e345f65f607c26ec9b78746b6e647e80b55acf4b782d38b475c9af772fa87bf32a790ff10d01 SHA512 78cd898687b6be0ef0e86a43285fc6eb3283407ce8aa4cc11d5e6e28ff6e87ea86f0dbd27fe44d5bb12ad61a03775fab771b9fed4787c7109907a62b25c0288f
+EBUILD nemo-6.2.6.ebuild 3306 BLAKE2B 013c401600b375256b5c40f4049fac67e99d08953194d2b2f9a4c8adb775d03226b978d180ce10ab3bce8c11f8dbd2d4f8336de38e5e74826425ee566ffad0c5 SHA512 7214a043199c809a9c1a96184b7719bab4bfec3d6d917b10a1adc9e0523ab81ece28214a8dfe2c663045f7e7f4e6b5627082ca554317f1411e9169b4687c4427
 MISC metadata.xml 580 BLAKE2B da0ac9cd13730b5c1727a6d0431f3289af829b77781baf4d3512c78139bca7b9a7d136563de8e2f5abf914520de8a5a092b1e0f2505558e5e61813fa5f9c09ad SHA512 d38cebfe673764a4a96d66a66afe55f6f04c74bf1d06d8fddc319a2eb9ed351b205e3a48c47bfeff7f3da85c89ad0512e11a420f82c228a548fc7553147b927e
diff --git a/gnome-extra/nemo/nemo-5.8.4.ebuild b/gnome-extra/nemo/nemo-6.2.6.ebuild
index 5c5b7abf7de8..6193e5aae1d7 100644
--- a/gnome-extra/nemo/nemo-5.8.4.ebuild
+++ b/gnome-extra/nemo/nemo-6.2.6.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
+EAPI=8
 
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..13} )
 
 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 ~loong ~ppc64 ~riscv x86"
-IUSE="exif gtk-doc +nls selinux test tracker 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
@@ -25,20 +25,32 @@ COMMON_DEPEND="
 	>=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/json-glib-1.6.0
 	>=dev-libs/libxml2-2.7.8:2
-	>=gnome-extra/cinnamon-desktop-5.8:0=
+	>=gnome-extra/cinnamon-desktop-6.2: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.6.1
+	>=x11-libs/xapp-2.8.4[introspection]
 
-	exif? ( >=media-libs/libexif-0.6.20 )
-	selinux? ( sys-libs/libselinux )
-	tracker? ( app-misc/tracker:3 )
-	xmp? ( >=media-libs/exempi-2.2.0:= )
+	exif? (
+		>=media-libs/libexif-0.6.20
+	)
+	selinux? (
+		sys-libs/libselinux
+	)
+	tracker? (
+		app-misc/tracker:3
+	)
+	wayland? (
+		>=gui-libs/gtk-layer-shell-0.8.0
+	)
+	xmp? (
+		>=media-libs/exempi-2.2.0:=
+	)
 "
 RDEPEND="
 	${COMMON_DEPEND}
@@ -47,7 +59,9 @@ RDEPEND="
 	')
 	x11-themes/adwaita-icon-theme
 
-	nls? ( >=gnome-extra/cinnamon-translations-5.8 )
+	nls? (
+		>=gnome-extra/cinnamon-translations-6.2
+	)
 "
 PDEPEND="
 	>=gnome-base/gvfs-0.1.2
@@ -62,7 +76,9 @@ BDEPEND="
 	sys-devel/gettext
 	virtual/pkgconfig
 
-	gtk-doc? ( dev-util/gtk-doc )
+	gtk-doc? (
+		dev-util/gtk-doc
+	)
 "
 
 PATCHES=(
@@ -105,6 +121,7 @@ src_configure() {
 		$(meson_use selinux)
 		$(meson_use tracker)
 		$(meson_use gtk-doc gtk_doc)
+		$(meson_use wayland gtk_layer_shell)
 	)
 	meson_src_configure
 }
author	V3n3RiX <venerix@koprulu.sector>	2024-08-07 12:37:21 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2024-08-07 12:37:21 +0100
commit	b8c7370a682e4e29cda623222d17a790c01c3642 (patch)
tree	f6caa14689bd00a5760eadaa381ff41e50ef3c1b /gnome-extra
parent	8a4997a7e2d1e36c089d4d76935b5a902d98d3d0 (diff)