gentoo resync : 02.02.2022

5 files changed, 116 insertions, 53 deletions

diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest
index 274451c38722..2ca12ed50615 100644
--- a/gnome-extra/cinnamon/Manifest
+++ b/gnome-extra/cinnamon/Manifest
@@ -1,9 +1,9 @@
 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-4.8.6-build-fixes.patch 981 BLAKE2B 735028024dfe3b0d280875411d03a2a005efb6344650e2278778621e655818c074c894f0988c1f5974ee73e341f8a4304c9834e205701fb2fe0646fbf9b7c9a4 SHA512 6a9de0e477bec8cdddf302c0878dd213f02047a71cdd6b6090cf8ed6616d185880fa18033c24c13bed6e0e651224ddd9c779320c3f441398d6c36b2741a6bd4d
+AUX cinnamon-5.2.7-optional-eds.patch 2550 BLAKE2B c6d1a8fcc476201b692869ea47bc2262b4a79d754ada3c7c9828eb5c48102c7ad79c81482805797fdf3418c8d1f91b833783a6e7e5139c0004fecdfba8539121 SHA512 18187b72bdec52f91fb10835aa4a00df8c392056c447513cb14f8d455243d5c1ea36d25b872b872e0bd23a74a68f1eb46e7214a3ff0277c58264499b1486c9c3
 AUX polkit-cinnamon-authentication-agent-1.desktop 252 BLAKE2B 8a7c10fa19e19c479ab40e9599b8804bc42a78548b9a09f34edc497dc5c9cbcd6958dbbb93cede57c0bf7938cc22f49c229274941b9509ad220e8790ed26bf9e SHA512 7857dc3d08129c37c461b85049d3a12b6602853d7dc44e68d79ce28bbe1121051a2061a4a4de050402230f85755d2800143e3373708fa19d43a001f7f1100360
-DIST cinnamon-4.8.6.tar.gz 2378117 BLAKE2B ae98bf81aa3b2f26d33aa1b5a8109b50d969cb3568322159808c23d13fea6a11790d877a446b3ee4a54f5811fddfb5fca220f46bc213ffc2aa4560e344563f9d SHA512 827d93fa72213e00977d6318da25d9b03279666485ed4c4fd45ece9914c7481f39fa98c64940529a7459cc239783caa9427a2a702f77ffb77fb2c38073e42bbd
 DIST cinnamon-5.0.6.tar.gz 2397950 BLAKE2B e54f8ed02fc36c121d15d30aaed4633f7db30bcf3e0179fb5fa0b9f12b42f0a29b341f531eed7ba19f849c0400ee9887ee59b5218f4558586a360d173798aeea SHA512 3ed835b1c41a34dfd1e2eac7746bfa01fe48359c6c3e8085877a4c18b895ea065efc343a855cbdee3fcbfb63aa40166bbe40fa19154ae1544be675411d49a962
-EBUILD cinnamon-4.8.6.ebuild 5028 BLAKE2B 3afddcd102ded05641665b6b0ba2571119296a4d58aba59bea55824fcbf3e0eef53f84e0a3ed88d168ad4cb06b9169771819d75d46270a01503e0c0aed84ffc2 SHA512 398060a0c4e903a8ebccfc7995ac823f14518fcedf81a1ab771996e7e9314accadb84def76b557d72aaf56c4f43dbd4ca8c09fe1111526f0eb5b8c0c93cca2af
-EBUILD cinnamon-5.0.6.ebuild 5047 BLAKE2B 6729b479ebd8e49e50ada5137affa83b13d864afb5cc0467f031f19d0942390e81ceca4629a95af38d454135d085d5ce0aecd78b9defe63366dc124a8393bb39 SHA512 8af350b2b11231aabccd9690b5c7234912b294ad753ce8c1948e869219ebb3c5afe5519487d129f22adb3866810b6ecc744f87be71f8a358d699da0500aaef21
+DIST cinnamon-5.2.7.tar.gz 2423949 BLAKE2B f4ce9ec4c79eab3daadff958c0a334d49757548203078ab657ebe2450f3f179c942df9d0f9089efe313c268c929628d724db43371e12338606d284a2738ed62c SHA512 62cbbe2f719574b3f70a4895c231be9ad65a41220d2755cc1557bc06bb2b31ced93621c356f2973376d127d5a1e59f9295498bbc4812d428e8605e8f4882c733
+EBUILD cinnamon-5.0.6.ebuild 5054 BLAKE2B 52f7e2a5ec5beb15ae6126bacbd00b50a265fc5ce5d3001688b1a31e3c117b4c25d990ca1501d854198146d9350333bd590f198e5fbfd9e9a0156e41c8f11f75 SHA512 5fd51ead2890c68de3f02938dfd422503e163a1b38b9d95c45de3e25e285f2063ecb01acc68da85539b4b682ace4bd6d68f427f3d978372684a1ce7b262fd9d6
+EBUILD cinnamon-5.2.7.ebuild 5253 BLAKE2B 7a30123d42393780b6bb7c938e3ee23dd03b8fab6567a1385484327131e58f084c8b50381f978bcb41de4f7322028cee4db48aa78d773053fd78beb5cd356dbf SHA512 1df5b0ae6c058414310270ef58d77e21e529f52b0c264fb45aa83e78a8ce359154b4904083acc2e59e7fbd24452782a6c3d39b49f46df837d05ce83e3a3b0989
 MISC metadata.xml 488 BLAKE2B 422b0fe2eb6afbe708925e9fb6fa7f038497b11d51e06165e69e43515a27cf4a77c74a1a10156bbcfd6084704bbfa7f24d4e8a8409970c5d365aa6ba80ab5bd8 SHA512 5952deb426e8adcceb83a9bcaf94bbe96e4f065fbdfd6fa17b08988989f79c3f1de55e58ca13a26a6146b5cef90d8e3853d614d390c7afe0d2494d78ea3df744
diff --git a/gnome-extra/cinnamon/cinnamon-5.0.6.ebuild b/gnome-extra/cinnamon/cinnamon-5.0.6.ebuild
index ffd267b82e46..f07b7f6d2201 100644
--- a/gnome-extra/cinnamon/cinnamon-5.0.6.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-5.0.6.ebuild
@@ -68,7 +68,7 @@ RDEPEND="
 		dev-python/pytz[${PYTHON_USEDEP}]
 		dev-python/setproctitle[${PYTHON_USEDEP}]
 		dev-python/tinycss2[${PYTHON_USEDEP}]
-		>=dev-python/xapp-2.2.0[${PYTHON_USEDEP}]
+		>=dev-python/python3-xapp-2.2.0[${PYTHON_USEDEP}]
 	')
 	>=gnome-base/dconf-0.4.1
 	>=gnome-base/gsettings-desktop-schemas-2.91.91
@@ -82,7 +82,7 @@ RDEPEND="
 	net-misc/wget
 	sys-apps/accountsservice[introspection]
 	sys-power/upower[introspection]
-	>=x11-libs/xapps-2.2.0[introspection]
+	>=x11-libs/xapp-2.2.0[introspection]
 	x11-misc/xdg-utils
 	x11-themes/adwaita-icon-theme
 	x11-themes/gnome-themes-standard
diff --git a/gnome-extra/cinnamon/cinnamon-4.8.6.ebuild b/gnome-extra/cinnamon/cinnamon-5.2.7.ebuild
index 768aacbecf1d..976736f285f6 100644
--- a/gnome-extra/cinnamon/cinnamon-4.8.6.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-5.2.7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9,10} )
 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="GPL-2+"
 SLOT="0"
-IUSE="+gstreamer gtk-doc +nls +networkmanager"
+IUSE="+eds +gstreamer gtk-doc +nls +networkmanager"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 
 DEPEND="
 	${PYTHON_DEPS}
@@ -24,9 +24,9 @@ DEPEND="
 	>=dev-libs/glib-2.52.0:2[dbus]
 	>=dev-libs/gobject-introspection-1.29.15:=
 	dev-libs/libxml2:2
-	>=gnome-extra/cinnamon-desktop-4.8:0=
-	>=gnome-extra/cinnamon-menus-4.8
-	>=gnome-extra/cjs-4.8[cairo]
+	>=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]
 	sys-apps/dbus
 	>=sys-auth/polkit-0.100[introspection]
@@ -38,8 +38,11 @@ DEPEND="
 	>=x11-libs/libXfixes-5.0
 	x11-libs/pango[introspection]
 	>=x11-libs/startup-notification-0.11
-	>=x11-wm/muffin-4.8.0[introspection]
+	>=x11-wm/muffin-5.2[introspection]
 
+	eds? (
+		gnome-extra/evolution-data-server
+	)
 	gstreamer? (
 		media-libs/gst-plugins-base:1.0
 		media-libs/gstreamer:1.0
@@ -68,27 +71,27 @@ RDEPEND="
 		dev-python/pytz[${PYTHON_USEDEP}]
 		dev-python/setproctitle[${PYTHON_USEDEP}]
 		dev-python/tinycss2[${PYTHON_USEDEP}]
-		dev-python/xapp[${PYTHON_USEDEP}]
+		>=dev-python/python3-xapp-2.2.1-r1[${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-4.8[networkmanager=]
-	>=gnome-extra/cinnamon-screensaver-4.8
-	>=gnome-extra/cinnamon-session-4.8
-	>=gnome-extra/cinnamon-settings-daemon-4.8
-	>=gnome-extra/nemo-4.8
+	>=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/polkit-gnome
 	net-misc/wget
 	sys-apps/accountsservice[introspection]
 	sys-power/upower[introspection]
-	>=x11-libs/xapps-2.0.5[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-4.8
+		>=gnome-extra/cinnamon-translations-5.2
 	)
 "
 BDEPEND="
@@ -108,9 +111,8 @@ PATCHES=(
 	# https://github.com/linuxmint/Cinnamon/issues/3576
 	"${FILESDIR}"/${PN}-3.6.6-wheel-sudo.patch
 
-	# GStreamer only needed for recorder
-	# https://github.com/linuxmint/cinnamon/pull/9809
-	"${FILESDIR}"/${PN}-4.8.6-build-fixes.patch
+	# Make evolution-data-server integration optional
+	"${FILESDIR}"/${PN}-5.2.7-optional-eds.patch
 )
 
 src_prepare() {
@@ -129,9 +131,11 @@ src_prepare() {
 
 src_configure() {
 	local emesonargs=(
+		$(meson_use eds build_calendar_server)
 		$(meson_use gstreamer build_recorder)
 		$(meson_use gtk-doc docs)
 		-Ddisable_networkmanager=$(usex networkmanager false true)
+		-Dpy3modules_dir="$(python_get_sitedir)"
 	)
 	meson_src_configure
 }
@@ -139,6 +143,7 @@ src_configure() {
 src_install() {
 	meson_src_install
 
+	python_optimize "${D}$(python_get_sitedir)"
 	python_optimize "${ED}"/usr/share/cinnamon/
 
 	# Required for gnome-shell on hardened/PaX, bug #398941
@@ -166,7 +171,8 @@ pkg_postinst() {
 			ewarn "org.cinnamon.recorder/pipeline to what you want to use."
 		fi
 	else
-		ewarn "Cinnamon's built-in screen recording utility is disabled."
+		ewarn "Cinnamon's built-in screen recording utility is not installed"
+		ewarn "because gstreamer support is disabled."
 	fi
 }
 
diff --git a/gnome-extra/cinnamon/files/cinnamon-4.8.6-build-fixes.patch b/gnome-extra/cinnamon/files/cinnamon-4.8.6-build-fixes.patch
deleted file mode 100644
index bc4476a5892e..000000000000
--- a/gnome-extra/cinnamon/files/cinnamon-4.8.6-build-fixes.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/meson.build b/meson.build
-index a4d49a16..eff937ac 100644
---- a/meson.build
-+++ b/meson.build
-@@ -36,8 +36,6 @@ gio_unix = dependency('gio-unix-2.0')
- gl = dependency('gl')
- glib_version = '2.52.0'
- glib = dependency('glib-2.0', version: '>= ' + glib_version)
--gstreamer = dependency('gstreamer-1.0')
--gstreamer_base = dependency('gstreamer-base-1.0')
- gtk = dependency('gtk+-3.0', version: '>= 3.12.0')
- muffin = dependency('libmuffin', version: '>= 4.0.3')
- muffinlibdir = muffin.get_pkgconfig_variable('typelibdir')
-@@ -53,6 +51,14 @@ if has_nm
-     dependency('libnm')
- endif
- 
-+if get_option('build_recorder')
-+	gstreamer = dependency('gstreamer-1.0')
-+	gstreamer_base = dependency('gstreamer-base-1.0')
-+else
-+	gstreamer = dependency('', required: false)
-+	gstreamer_base = dependency('', required: false)
-+endif
-+
- # on some systems we need to find the math lib to make sure it builds
- cc = meson.get_compiler('c')
- math = cc.find_library('m', required: false)
diff --git a/gnome-extra/cinnamon/files/cinnamon-5.2.7-optional-eds.patch b/gnome-extra/cinnamon/files/cinnamon-5.2.7-optional-eds.patch
new file mode 100644
index 000000000000..c0646359552b
--- /dev/null
+++ b/gnome-extra/cinnamon/files/cinnamon-5.2.7-optional-eds.patch
@@ -0,0 +1,85 @@
+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 1d1035c60..ebfd5a3a4 100644
+--- a/files/usr/share/cinnamon/applets/calendar@cinnamon.org/eventView.js
++++ b/files/usr/share/cinnamon/applets/calendar@cinnamon.org/eventView.js
+@@ -301,7 +301,7 @@ class EventsManager {
+     }
+ 
+     start_events() {
+-        if (this._calendar_server == null) {
++        if (this._calendar_server == null && Cinnamon.CalendarServerProxy) {
+             Cinnamon.CalendarServerProxy.new_for_bus(
+                 Gio.BusType.SESSION,
+                 // Gio.DBusProxyFlags.NONE,
+diff --git a/meson.build b/meson.build
+index 2c1baf47d..aba5d5a30 100644
+--- a/meson.build
++++ b/meson.build
+@@ -179,6 +179,9 @@ install_subdir(
+     strip_directory: true,
+ )
+ 
+-subdir('calendar-server')
++
++if get_option('build_calendar_server')
++    subdir('calendar-server')
++endif
+ subdir('python3')
+ subdir('install-scripts')
+diff --git a/meson_options.txt b/meson_options.txt
+index 82422246b..752f7904e 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -13,6 +13,11 @@ option('build_recorder',
+     value: true,
+     description: 'Build the cinnamon recorder into source'
+ )
++option('build_calendar_server',
++    type: 'boolean',
++    value: true,
++    description: 'Build the cinnamon EDS calendar server'
++)
+ option('disable_networkmanager',
+     type: 'boolean',
+     value: false,
+diff --git a/src/meson.build b/src/meson.build
+index 7999c0a67..1b22aa279 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -3,12 +3,6 @@ subdir('hotplug-sniffer')
+ 
+ include_src = include_directories('.')
+ 
+-calendar_generated = gnome.gdbus_codegen('cinnamon-calendar',
+-  sources: 'org.cinnamon.CalendarServer.xml',
+-  interface_prefix: 'org.cinnamon.',
+-  namespace: 'Cinnamon'
+-)
+-
+ cinnamon_headers = [
+     'cinnamon-app.h',
+     'cinnamon-app-system.h',
+@@ -59,10 +53,21 @@ cinnamon_sources = [
+     'cinnamon-window-tracker.c',
+     'cinnamon-wm.c',
+     'cinnamon-xfixes-cursor.c',
+-    cinnamon_headers,
+-    calendar_generated
++    cinnamon_headers
+ ]
+ 
++if get_option('build_calendar_server')
++    calendar_generated = gnome.gdbus_codegen('cinnamon-calendar',
++      sources: 'org.cinnamon.CalendarServer.xml',
++      interface_prefix: 'org.cinnamon.',
++      namespace: 'Cinnamon'
++    )
++
++    cinnamon_sources += [
++        calendar_generated
++    ]
++endif
++
+ cinnamon_enum_types = gnome.mkenums_simple(
+     'cinnamon-enum-types',
+     sources: cinnamon_headers,