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

3 files changed, 51 insertions, 12 deletions

diff --git a/gnome-extra/cinnamon-session/Manifest b/gnome-extra/cinnamon-session/Manifest
index d562f35eaf9f..07c228dd4c0e 100644
--- a/gnome-extra/cinnamon-session/Manifest
+++ b/gnome-extra/cinnamon-session/Manifest
@@ -1,5 +1,6 @@
-DIST cinnamon-session-5.6.0.tar.gz 199389 BLAKE2B ecd8152af4784affc8c9b8ae7ca48adaecca4355c2db5d64ca577f44abc0ff35cf27ef324fa9d3520c125bc979727bbab67f99209e5a641ad0329a26025698b5 SHA512 260acb2a4e7016af3be2865d51eb947774020fc4e333e6a4ce72664d182c098f663d1878ac2194607f04517c3ea6916d2bfc5e55749f8252a38205b227d40335
+AUX cinnamon-session-6.0.0-fix-optional-systemd.patch 605 BLAKE2B 29057363842f23a5b37583ab5d2cf312fbf31f9ef78b66e9b70980051771cc701f9e5b811d03d3534046c2cb76fda1751fc11b36cbcf90685b6fc05dd3773158 SHA512 7b89ef4d9915d50377c0ad10a1296a6bd5a11dbb2f30b2e2531aa817335776d08823b4a6401c0d4638f0d89674d91c3165aafa0b217dd488e7127e8fbc6ba9c6
 DIST cinnamon-session-5.8.1.tar.gz 199477 BLAKE2B 9371089e3caa4765498c2fa3ab9e5de03d47a67bced8a1a14fec33d7aea3372950b1e8f7f88be825697c8a2899dc0812f6ec7c5fb008f4bf2f4b5bdc343c01cc SHA512 8a88834a639c74b227f0d666fa2bcb4c3f73859ff8de84a440e84af3f3343c41c47a896ccf0dc09cc7114b7c921e2f670aec7846c57ec92b8da3333be7955309
-EBUILD cinnamon-session-5.6.0-r1.ebuild 1413 BLAKE2B e32f2bb811a566993d8ada800a8979154cfd3e6c5b4318c0d1726686ac8d294c3d232895b5c6f27c1205bc8732257da2e42625e20f31e2b800f46e4880bc4e66 SHA512 2f8824a165a5573f276db51d97b573f7eb9a92b66294acb6f7ed459d719af77371a768b09abb47600f030b5746aa9b55e07eaa31a32b93f60fd072490c6c4a7d
+DIST cinnamon-session-6.0.2.tar.gz 165188 BLAKE2B 077552f147a61d4615db8091411314560a12b5c40420381280e41a35395119ece15602f9c74bac3409b49d4363285a386555a787ced10dee5ca757d254ccb7ec SHA512 80e1c5b8654aad805424351c1a49cc3f68e52ddcf0606180fd5ee006607829f4f451c6bdd9be7e022a258041e8a6967faf0b16b8536a0a8982dcc805e35fd01a
 EBUILD cinnamon-session-5.8.1.ebuild 1420 BLAKE2B 45ec08fd6e7e8772785f60316986776e407293cd6e8113d0d6d46e5bd3124268c0ce670bbe93bef8aa01314d122bf2f71cc69e951124d6d7cef986f515b0aa34 SHA512 45daba06db4328d5fb0a1b80e16c4abdf649de6c48a29ded174bfa8a4fb8e7cbd8b6525612f4b0ab458d5c11ae34ede09838c464daf79d96366ab9d5b2379da8
+EBUILD cinnamon-session-6.0.2.ebuild 1838 BLAKE2B fd3446f09a2f605756c37ea23ad53b25cd39acc780541167dd00fa620de8fa0be4e7f54c36501a5eb11c6f375071721f4f074c0b570e7ac1bc0f7d7b060deb7e SHA512 309088c8d9f6a81786b3dfef4987e448316057047a90902b3520f2d39efaf1968cead9664c3a362efbe8031a5ea835be0bd238fe0d0ea6be9a1ed69f9b94fa0d
 MISC metadata.xml 496 BLAKE2B 3b3170a447d7818cdd93b3183feee36751832a07da741b16dfdfe029e09733f3ba94815312e6444b3421dd7bc3df9b4ca2f1c1ac2a5d83ae3881b1ab7cf809c0 SHA512 65d223bf44f83d8d2bda72791b362c4302ec813e9090331cf5ddc97e10ed610c1a91c6d467ff72d7e1430e7d70dcfa09f9c8e35c50a86130236798c80e19a2f2
diff --git a/gnome-extra/cinnamon-session/cinnamon-session-5.6.0-r1.ebuild b/gnome-extra/cinnamon-session/cinnamon-session-6.0.2.ebuild
index 72fcdd267568..cefd1f0a4183 100644
--- a/gnome-extra/cinnamon-session/cinnamon-session-5.6.0-r1.ebuild
+++ b/gnome-extra/cinnamon-session/cinnamon-session-6.0.2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
-inherit meson gnome2-utils python-any-r1 xdg-utils
+inherit meson gnome2-utils python-single-r1 xdg-utils
 
 DESCRIPTION="Cinnamon session manager"
 HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon-session"
@@ -13,16 +13,18 @@ SRC_URI="https://github.com/linuxmint/cinnamon-session/archive/${PV}.tar.gz -> $
 
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="systemd"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 COMMON_DEPEND="
 	>=dev-libs/glib-2.37.3:2
+	>=gnome-extra/cinnamon-desktop-6.0:0=
 	media-libs/libcanberra[pulseaudio]
 	virtual/opengl
 	x11-libs/cairo
 	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3:3
+	>=x11-libs/gtk+-3:3[introspection]
 	x11-libs/libICE
 	x11-libs/libSM
 	x11-libs/libX11
@@ -32,10 +34,14 @@ COMMON_DEPEND="
 	x11-libs/libXrender
 	x11-libs/libXtst
 	x11-libs/pango[X]
-	>=x11-libs/xapp-2.4.1
+	>=x11-libs/xapp-2.8.1[introspection]
 
-	systemd? ( >=sys-apps/systemd-183 )
-	!systemd? ( sys-auth/elogind[policykit] )
+	systemd? (
+		>=sys-apps/systemd-183
+	)
+	!systemd? (
+		sys-auth/elogind[policykit]
+	)
 "
 DEPEND="
 	${COMMON_DEPEND}
@@ -43,7 +49,12 @@ DEPEND="
 "
 RDEPEND="
 	${COMMON_DEPEND}
-	>=gnome-extra/cinnamon-desktop-5.6:0=
+	${PYTHON_DEPS}
+	dev-libs/gobject-introspection
+	$(python_gen_cond_dep '
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		dev-python/setproctitle[${PYTHON_USEDEP}]
+	')
 "
 BDEPEND="
 	${PYTHON_DEPS}
@@ -51,9 +62,15 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	# Fix bad systemd include
+	# https://github.com/linuxmint/cinnamon-session/pull/164
+	"${FILESDIR}/${PN}-6.0.0-fix-optional-systemd.patch"
+)
+
 src_prepare() {
 	default
-	python_fix_shebang data
+	python_fix_shebang data cinnamon-session-quit
 }
 
 src_configure() {
diff --git a/gnome-extra/cinnamon-session/files/cinnamon-session-6.0.0-fix-optional-systemd.patch b/gnome-extra/cinnamon-session/files/cinnamon-session-6.0.0-fix-optional-systemd.patch
new file mode 100644
index 000000000000..cee6e14b8fe1
--- /dev/null
+++ b/gnome-extra/cinnamon-session/files/cinnamon-session-6.0.0-fix-optional-systemd.patch
@@ -0,0 +1,21 @@
+From 44ac74ea7e771a35a41235b4e7d2539d4521b626 Mon Sep 17 00:00:00 2001
+From: Sparky Bluefang <sparky@bluefang-logic.com>
+Date: Tue, 2 Jan 2024 23:26:20 -0500
+Subject: [PATCH] Remove orphaned include
+
+---
+ cinnamon-session/main.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/cinnamon-session/main.c b/cinnamon-session/main.c
+index 49d1e32..802a1ae 100644
+--- a/cinnamon-session/main.c
++++ b/cinnamon-session/main.c
+@@ -40,7 +40,6 @@
+ #include "csm-session-fill.h"
+ #include "csm-store.h"
+ #include "csm-system.h"
+-#include <systemd/sd-journal.h>
+ 
+ #define CSM_DBUS_NAME "org.gnome.SessionManager"
+