gentoo auto-resync : 08:05:2023 - 05:38:21

5 files changed, 24 insertions, 243 deletions

diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest
index b00e16f48cba..9c040ae09189 100644
--- a/gnome-extra/cinnamon/Manifest
+++ b/gnome-extra/cinnamon/Manifest
@@ -1,11 +1,8 @@
 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-5.2.7-eds-detection.patch 5038 BLAKE2B 287cdf4bd91b8be422a471fd86dd6083d26cf9eabbcbc573d6efd27b55c58fb94b47f3c474b6dbb9dbc8d0da700bfccb56599e23995983d94b6f5b2aa4026ef7 SHA512 da73e53738987fbb045070061fbc88c21b9dac53fc4d35ecb5320661663ef0e4019e88cf362dd3eb8e172797f0a7dd93e33723bf727cb7db24042c0815933565
-AUX cinnamon-5.2.7-meson-0.61-fix.patch 1668 BLAKE2B bf0490423fcfa3d1228a3b1090264449c98f9beebdc064a5815e8603faa494473a46cf6be46e6003a32ab8610ff6e8621e815437052bb5b3d6cccd6c428088ba SHA512 69d8ca0413ad2d1b6e259eeb2d3538cff16b6c3a50491cb288c462363880f9ee9299547141120a3a8e9ab364049178eec0851ab972415e2845e9ed21d3075f9b
-AUX cinnamon-5.2.7-revert-meson-0.60-fix.patch 2020 BLAKE2B 83060c16d8f91188bbfc9e784633ad4d40ba1ab91c1b980866b5d6870cffddbabdce6eceb7121543618e7d94b5f02ed115ea915b7371acb8f271ce6391b98759 SHA512 2c41deff381bc043eee05fc106a7c6b4177728b6500279d0185b99a8f5014ca04158b6348ab3f47c28938f2559193916abc80d387c8ffbb1528532ad26ce1f33
 AUX polkit-cinnamon-authentication-agent-1.desktop 252 BLAKE2B 8a7c10fa19e19c479ab40e9599b8804bc42a78548b9a09f34edc497dc5c9cbcd6958dbbb93cede57c0bf7938cc22f49c229274941b9509ad220e8790ed26bf9e SHA512 7857dc3d08129c37c461b85049d3a12b6602853d7dc44e68d79ce28bbe1121051a2061a4a4de050402230f85755d2800143e3373708fa19d43a001f7f1100360
-DIST cinnamon-5.2.7.tar.gz 2423949 BLAKE2B f4ce9ec4c79eab3daadff958c0a334d49757548203078ab657ebe2450f3f179c942df9d0f9089efe313c268c929628d724db43371e12338606d284a2738ed62c SHA512 62cbbe2f719574b3f70a4895c231be9ad65a41220d2755cc1557bc06bb2b31ced93621c356f2973376d127d5a1e59f9295498bbc4812d428e8605e8f4882c733
 DIST cinnamon-5.6.5.tar.gz 2481833 BLAKE2B af7f5010cba9afac9c37aca60f1d6a730fca9bcfe4860a79e8f7cc903cbff45cde4d650530309c4866eeedd52212a4287221e89e5616b3ab0d0903cad3a33afb SHA512 767a68683f2776a1216ec32c479a84203c8524e7bbf2bd65faf4249a46d1a2ccfae8feb55d664890c1b1cd2061895c79d9bec5a70f126b819baebb19804ac30c
-EBUILD cinnamon-5.2.7-r4.ebuild 5458 BLAKE2B 1dcd0e11cbc4f83201af552354e0c613a9d2c27d23743812deff9856a2c33535901e8b7df35c74afdaadc6757fde05c840124ed63a826fe65e8ebb38cc23c6db SHA512 d1c6a1950e7a6b46c2b35944a4dc3f76bd6874913a0d56465ff075cf6609f8f2fb46024561d37d897db466135e646cc2681641ca2a94c55790437e5ea05fbdf5
+DIST cinnamon-5.6.8.tar.gz 2483519 BLAKE2B 0876bf097bbdb2b15b543a09d7d659995624d880a4c32a0d6bf580def4a72d33363c03525cd8072a238c624382c20bb66ce5ad5c05f8c21bbe5c06742209ca2b SHA512 33f7766f8d5df070cca7d4001be6a01dcb5cc57e60a320b0b2d14968af7bc0060575284f885de640ebe9297ea2bf9a6b97cb32dfb50fac37bb6d851d5f5d2237
 EBUILD cinnamon-5.6.5.ebuild 5276 BLAKE2B 0b80dee843dc0c87d0c78986a34bf073aa584326cfa2f157d7c1762aae7e73832c869886a071689f96a473e53449d48af2b1df0990569407c0deefa5f46563dd SHA512 8669baf3a076e35e5133b763daff98062c5f71176a864d019d7421598906c6d929bbe2fd02a4353ebd5badd269bc7b55425c04746817d7714d7f6da13a46e436
+EBUILD cinnamon-5.6.8.ebuild 5295 BLAKE2B 14113451ec643b224bf960b192a9d068d8a5d0d0ca3a418c2cb6af80316976add647f6c2968372c058bd34f338838aed165565ddbdecf9b5e23aae52591cd3e3 SHA512 5d369a2ad7213aa90aa5fca269b1b01018d849778577365f9cf674dac22f08652a1eb5ff356613fa8cf8211b3e2d0ac1b8604bdd8433cd9359044c08df7a6f91
 MISC metadata.xml 488 BLAKE2B 422b0fe2eb6afbe708925e9fb6fa7f038497b11d51e06165e69e43515a27cf4a77c74a1a10156bbcfd6084704bbfa7f24d4e8a8409970c5d365aa6ba80ab5bd8 SHA512 5952deb426e8adcceb83a9bcaf94bbe96e4f065fbdfd6fa17b08988989f79c3f1de55e58ca13a26a6146b5cef90d8e3853d614d390c7afe0d2494d78ea3df744
diff --git a/gnome-extra/cinnamon/cinnamon-5.2.7-r4.ebuild b/gnome-extra/cinnamon/cinnamon-5.6.8.ebuild
index 3a84b9b0a81a..11a627c66a36 100644
--- a/gnome-extra/cinnamon/cinnamon-5.2.7-r4.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-5.6.8.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{9,10} )
+PYTHON_COMPAT=( python3_{10..11} )
 PYTHON_REQ_USE="xml(+)"
 
 inherit meson gnome2-utils pax-utils python-single-r1 xdg
@@ -12,36 +12,33 @@ DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2"
 HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon"
 SRC_URI="https://github.com/linuxmint/cinnamon/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
-LICENSE="GPL-2+ GPL-3 LGPL-2.1"
+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"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-KEYWORDS="amd64 ~arm64 ~riscv x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 
 DEPEND="
 	${PYTHON_DEPS}
-	|| (
-		>=app-accessibility/at-spi2-core-2.46.0:2
-		( app-accessibility/at-spi2-atk dev-libs/atk )
-	)
+	>=app-accessibility/at-spi2-core-2.46.0:2
 	>=dev-libs/glib-2.52.0:2[dbus]
 	>=dev-libs/gobject-introspection-1.29.15:=
 	dev-libs/libxml2:2
-	>=gnome-extra/cinnamon-desktop-5.2:0=
-	>=gnome-extra/cinnamon-menus-5.2
-	>=gnome-extra/cjs-5.2[cairo]
-	net-libs/libsoup:2.4[introspection]
+	>=gnome-extra/cinnamon-desktop-5.6:0=
+	>=gnome-extra/cinnamon-menus-5.6
+	>=gnome-extra/cjs-5.6[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/libnotify-0.7.3:0=[introspection]
 	x11-libs/libX11
 	>=x11-libs/libXfixes-5.0
 	x11-libs/pango[introspection]
-	>=x11-libs/startup-notification-0.11
-	>=x11-wm/muffin-5.2[introspection]
+	>=x11-libs/xapp-2.4.1[introspection]
+	>=x11-wm/muffin-5.6[introspection]
 
 	eds? (
 		gnome-extra/evolution-data-server
@@ -75,27 +72,31 @@ RDEPEND="
 		dev-python/requests[${PYTHON_USEDEP}]
 		dev-python/setproctitle[${PYTHON_USEDEP}]
 		dev-python/tinycss2[${PYTHON_USEDEP}]
-		>=dev-python/python3-xapp-2.2.1-r1[${PYTHON_USEDEP}]
+		>=dev-python/python3-xapp-2.4.0[${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.2[networkmanager=]
-	>=gnome-extra/cinnamon-screensaver-5.2
-	>=gnome-extra/cinnamon-session-5.2
-	>=gnome-extra/cinnamon-settings-daemon-5.2
-	>=gnome-extra/nemo-5.2
+	>=gnome-extra/cinnamon-control-center-5.6[networkmanager=]
+	>=gnome-extra/cinnamon-screensaver-5.6
+	>=gnome-extra/cinnamon-session-5.6
+	>=gnome-extra/cinnamon-settings-daemon-5.6
+	>=gnome-extra/nemo-5.6
 	gnome-extra/polkit-gnome
+	media-libs/gsound
+	net-libs/libsoup:2.4[introspection]
 	net-misc/wget
 	sys-apps/accountsservice[introspection]
+	sys-apps/coreutils
+	sys-apps/pciutils
+	sys-apps/util-linux
 	sys-power/upower[introspection]
-	>=x11-libs/xapp-2.2.8[introspection]
 	x11-misc/xdg-utils
 	x11-themes/adwaita-icon-theme
 	x11-themes/gnome-themes-standard
 
 	nls? (
-		>=gnome-extra/cinnamon-translations-5.2
+		>=gnome-extra/cinnamon-translations-5.6
 	)
 "
 BDEPEND="
@@ -114,13 +115,6 @@ PATCHES=(
 	# Use wheel group instead of sudo (from Fedora/Arch)
 	# https://github.com/linuxmint/Cinnamon/issues/3576
 	"${FILESDIR}"/${PN}-3.6.6-wheel-sudo.patch
-
-	# Make evolution-data-server integration optional
-	"${FILESDIR}"/${PN}-5.2.7-eds-detection.patch
-
-	# Meson fixes
-	"${FILESDIR}"/${PN}-5.2.7-revert-meson-0.60-fix.patch
-	"${FILESDIR}"/${PN}-5.2.7-meson-0.61-fix.patch
 )
 
 src_prepare() {
diff --git a/gnome-extra/cinnamon/files/cinnamon-5.2.7-eds-detection.patch b/gnome-extra/cinnamon/files/cinnamon-5.2.7-eds-detection.patch
deleted file mode 100644
index bda0feedceb7..000000000000
--- a/gnome-extra/cinnamon/files/cinnamon-5.2.7-eds-detection.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-https://github.com/linuxmint/cinnamon/commit/ef463cc0aaedd714f2956daab227aeda1d87897e
-
-From ef463cc0aaedd714f2956daab227aeda1d87897e Mon Sep 17 00:00:00 2001
-From: Michael Webster <miketwebster@gmail.com>
-Date: Wed, 12 Jan 2022 14:50:47 -0500
-Subject: [PATCH] calendar events: Check if evolution-data-server is running
- before enabling events.
-
-None of the e-d-s libraries actually depend on evolution-data-server
-(which is what provides the backend to these libraries). Also, not
-everyone may want this sort of thing in the first place.
-
-So, check if the e-d-s service we require is active before trying
-to enable event support.
-
-ref: #10597, #10567
----
- .../applets/calendar@cinnamon.org/calendar.js |  2 +-
- .../calendar@cinnamon.org/eventView.js        | 43 +++++++++++++++----
- js/misc/interfaces.js                         |  4 ++
- 3 files changed, 39 insertions(+), 10 deletions(-)
-
-diff --git a/files/usr/share/cinnamon/applets/calendar@cinnamon.org/calendar.js b/files/usr/share/cinnamon/applets/calendar@cinnamon.org/calendar.js
-index 460883c063..5078a201ed 100644
---- a/files/usr/share/cinnamon/applets/calendar@cinnamon.org/calendar.js
-+++ b/files/usr/share/cinnamon/applets/calendar@cinnamon.org/calendar.js
-@@ -159,7 +159,7 @@ class Calendar {
-         this.desktop_settings = new Gio.Settings({ schema_id: DESKTOP_SCHEMA });
-         this.desktop_settings.connect("changed::" + FIRST_WEEKDAY_KEY, Lang.bind(this, this._onSettingsChange));
- 
--        this.events_enabled = true;
-+        this.events_enabled = false;
-         this.events_manager.connect("events-updated", this._events_updated.bind(this));
-         this.events_manager.connect("events-manager-ready", this._update_events_enabled.bind(this));
-         this.events_manager.connect("has-calendars-changed", this._update_events_enabled.bind(this));
-diff --git a/files/usr/share/cinnamon/applets/calendar@cinnamon.org/eventView.js b/files/usr/share/cinnamon/applets/calendar@cinnamon.org/eventView.js
-index 1d1035c605..2e73363fb7 100644
---- a/files/usr/share/cinnamon/applets/calendar@cinnamon.org/eventView.js
-+++ b/files/usr/share/cinnamon/applets/calendar@cinnamon.org/eventView.js
-@@ -17,6 +17,7 @@ const Main = imports.ui.main;
- const Util = imports.misc.util;
- const Mainloop = imports.mainloop;
- const Tweener = imports.ui.tweener;
-+const Interfaces = imports.misc.interfaces;
- 
- const STATUS_UNKNOWN = 0;
- const STATUS_NO_CALENDARS = 1;
-@@ -302,18 +303,42 @@ class EventsManager {
- 
-     start_events() {
-         if (this._calendar_server == null) {
--            Cinnamon.CalendarServerProxy.new_for_bus(
--                Gio.BusType.SESSION,
--                // Gio.DBusProxyFlags.NONE,
--                Gio.DBusProxyFlags.DO_NOT_AUTO_START_AT_CONSTRUCTION,
--                "org.cinnamon.CalendarServer",
--                "/org/cinnamon/CalendarServer",
--                null,
--                this._calendar_server_ready.bind(this)
--            );
-+            Interfaces.getDBusAsync((proxy, error) => {
-+                if (error) {
-+                    this.log_dbus_error(error);
-+                    return;
-+                }
-+
-+                proxy.NameHasOwnerRemote("org.gnome.evolution.dataserver.Calendar8", (has_owner, error) => {
-+                    if (error) {
-+                        this.log_dbus_error(error);
-+                        return;
-+                    }
-+
-+                    if (has_owner[0]) {
-+                        log("calendar@cinnamon.org: Calendar events supported.")
-+
-+                        Cinnamon.CalendarServerProxy.new_for_bus(
-+                            Gio.BusType.SESSION,
-+                            Gio.DBusProxyFlags.DO_NOT_AUTO_START_AT_CONSTRUCTION,
-+                            "org.cinnamon.CalendarServer",
-+                            "/org/cinnamon/CalendarServer",
-+                            null,
-+                            this._calendar_server_ready.bind(this)
-+                        );
-+                    } else {
-+                        log("calendar@cinnamon.org: No calendar event support (needs evolution-data-server)")
-+
-+                    }
-+                });
-+            })
-         }
-     }
- 
-+    log_dbus_error(e) {
-+        global.logError(`calendar@cinnamon.org: Could not check for calendar event support: ${e.toString()}`);
-+    }
-+
-     _calendar_server_ready(obj, res) {
-         try {
-             this._calendar_server = Cinnamon.CalendarServerProxy.new_for_bus_finish(res);
-diff --git a/js/misc/interfaces.js b/js/misc/interfaces.js
-index 8bc6e717d4..6bdb7b78c2 100644
---- a/js/misc/interfaces.js
-+++ b/js/misc/interfaces.js
-@@ -13,6 +13,10 @@ const DBusIface = '\
-             <arg type="s" direction="in" /> \
-             <arg type="s" direction="out" /> \
-         </method> \
-+        <method name="NameHasOwner"> \
-+            <arg type="s" direction="in" /> \
-+            <arg type="b" direction="out" /> \
-+        </method> \
-         <method name="ListNames"> \
-             <arg type="as" direction="out" /> \
-         </method> \
diff --git a/gnome-extra/cinnamon/files/cinnamon-5.2.7-meson-0.61-fix.patch b/gnome-extra/cinnamon/files/cinnamon-5.2.7-meson-0.61-fix.patch
deleted file mode 100644
index 3645221cc7a3..000000000000
--- a/gnome-extra/cinnamon/files/cinnamon-5.2.7-meson-0.61-fix.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-https://github.com/linuxmint/cinnamon/commit/9ccce54c29f7c78404e8819d7be7a051efff4df1
-
-From 9ccce54c29f7c78404e8819d7be7a051efff4df1 Mon Sep 17 00:00:00 2001
-From: Eli Schwartz <eschwartz@archlinux.org>
-Date: Thu, 3 Feb 2022 09:09:24 -0500
-Subject: [PATCH] gtkdoc: remove dependencies on custom target files (#10606)
-
-Sadly, the `dependencies` kwarg does not actually do what it seems to be
-trying to be used for, here. It is for listing dependency or library
-objects whose compiler flags should be added to gtkdoc-scangobj.
-
-It will not actually add ninja target dependencies. The similar kwarg in
-other meson functions (e.g. genmarshal and compile_schemas) that *do*
-allow adding target dependencies, is `depend_files`.
-
-Older versions of meson simply did nothing in an if/elif/elif block
-where these custom_targets never matched anything, and were thus
-silently ignored.
-
-Meson 0.61 type-validates the arguments and rejects CustomTarget as
-invalid:
-
-```
-docs/reference/cinnamon-js/meson.build:11:6: ERROR: gnome.gtkdoc keyword argument 'dependencies' was of type array[CustomTarget] but should have been array[Dependency | SharedLibrary | StaticLibrary]
-```
----
- docs/reference/cinnamon-js/meson.build | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/docs/reference/cinnamon-js/meson.build b/docs/reference/cinnamon-js/meson.build
-index 7c96c875a0..66a5e156eb 100644
---- a/docs/reference/cinnamon-js/meson.build
-+++ b/docs/reference/cinnamon-js/meson.build
-@@ -12,7 +12,6 @@ gnome.gtkdoc(
-     'cinnamon-js',
-     mode: 'xml',
-     main_xml: 'cinnamon-js-docs.sgml',
--    dependencies: parts_files,
-     src_dir: meson.current_build_dir(),
-     install: true,
- )
diff --git a/gnome-extra/cinnamon/files/cinnamon-5.2.7-revert-meson-0.60-fix.patch b/gnome-extra/cinnamon/files/cinnamon-5.2.7-revert-meson-0.60-fix.patch
deleted file mode 100644
index aa5503517ec7..000000000000
--- a/gnome-extra/cinnamon/files/cinnamon-5.2.7-revert-meson-0.60-fix.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-https://github.com/linuxmint/cinnamon/commit/aac7baf119dc48b685aefb3438e5ba3e61c8cb09
-
-From aac7baf119dc48b685aefb3438e5ba3e61c8cb09 Mon Sep 17 00:00:00 2001
-From: Eli Schwartz <eschwartz@archlinux.org>
-Date: Thu, 3 Feb 2022 09:11:39 -0500
-Subject: [PATCH] Revert "build: disable gir install via list to pacify meson
- >= 0.60.2 (#10489)" (#10596)
-
-This reverts commit 8fc2df08b40aa3e1958ed2fde853c50676d8cf48.
-
-This commit was wrong, because it tried to work around a bug in a single
-version of meson by using something that isn't, wasn't, and won't be a
-valid value.
-
-The fixed version of meson 0.60.x has been out for a while now, which
-once again accepts `false`, and 0.61.0 also accepts `false` but was
-known at the time of this workaround to not work in meson-git master
-(now meson 0.61.0).
-
-Using `false` is acceptable and the failure to accept it has been
-qualified as a meson regression. Using `[false]` is just... trying to
-fuzz meson with random objects until you get something that slips its
-way through the argument checker and produces desired effects on the
-python implementation level.
----
- src/meson.build    | 2 +-
- src/st/meson.build | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/meson.build b/src/meson.build
-index 7999c0a67b..34b130d50f 100644
---- a/src/meson.build
-+++ b/src/meson.build
-@@ -196,7 +196,7 @@ cinnamon_gir = gnome.generate_gir(
-     includes: cinnamon_gir_includes,
-     install: true,
-     install_dir_typelib: pkglibdir,
--    install_dir_gir: [false],
-+    install_dir_gir: false,
-     extra_args: [
-         '-DST_COMPILATION',
-         '--quiet',
-diff --git a/src/st/meson.build b/src/st/meson.build
-index d299727d06..ec7d7b30a1 100644
---- a/src/st/meson.build
-+++ b/src/st/meson.build
-@@ -213,7 +213,7 @@ st_gir = gnome.generate_gir(
-     includes: st_gir_includes,
-     install: true,
-     install_dir_typelib: pkglibdir,
--    install_dir_gir: [false],
-+    install_dir_gir: false,
-     extra_args: [
-         '-DST_COMPILATION',
-         '--quiet',