gentoo resync : 02.02.2022

3 files changed, 29 insertions, 52 deletions

diff --git a/gnome-extra/cinnamon-control-center/Manifest b/gnome-extra/cinnamon-control-center/Manifest
index fa29665ccb0c..8c27b5c58da9 100644
--- a/gnome-extra/cinnamon-control-center/Manifest
+++ b/gnome-extra/cinnamon-control-center/Manifest
@@ -1,6 +1,5 @@
-AUX cinnamon-control-center-4.8.2-build-fix.patch 1246 BLAKE2B c4e39834c7079573a363c9aa822a84839fdac5de2b9299545fafde9ed718e082ca3d37be63aa514fa43e60b33774d1cd1759202af6ade62b385c00a84cfb3e5a SHA512 3e3deadd7972ba4a642a8b69a809785ae34ff30cec1174e9d2a4ee8f9a27881e22629ae5b17dec92ba78c995bb012d1925d2a53d6acd89a155f17b3a74581df9
-DIST cinnamon-control-center-4.8.2.tar.gz 3865765 BLAKE2B 8e36888aec00252842bcdb3f29dd0728833c597260fdb6b2b160db455e900686086b1b04b393d58ec358f44aa64c14341e49738de7a85002a5e5d695974c578a SHA512 c64e554488b401291daf125cc5627201cac58d5e6efab697d0b9cac64b666a7d2a7e27f459bb560918876cc8cf5e3720c11a59cee70401e50682a4b82a20f1b5
 DIST cinnamon-control-center-5.0.2.tar.gz 3866962 BLAKE2B d292d610516647e149198cbfce652bfd094338612ef6b4765fcb80bd1fe15f2d643bbaa5343f1d79d57f3327c87a3256cfc3900493daf6f80569b1a0bacd821a SHA512 f47b88005ba1d7359ab99d80e99d2c42a93561ecddd98014f91674a5ae806b991169c88f3af6c8c187df23ebb8a9e12bbae5eefbfeaf2f3d087981192448c3c2
-EBUILD cinnamon-control-center-4.8.2.ebuild 2152 BLAKE2B d052a536b7af3cb8452c98d3c3273091335faf5d3106985c2ee2e8f2214a082fe7c487620467d35ec5c3f39e1f6cbbce67604ccf108312a95e8c1e89848ad02d SHA512 b4d36b1b3a76c6122d2bd041d871adfc637a1fc922a3d52816a83788291422515bc0a1571e164a22784c18190687343c964bd5440463cc70bcae335cf8241900
+DIST cinnamon-control-center-5.2.1.tar.gz 3863530 BLAKE2B 826494b8f8a4dead32d6031d7b4b2a44d357b3e8fedf1065b61193caa86ad433ba68fd9344f70bbce77bb94e086ae15f8854dc73916a5f60c49b1b2bd9e7101c SHA512 d322a9b460f13c697d327dda75a3ea16dd96414ed52ffbcdfc19479533178585da795c064ae441b36ef02f1aa779704db039328ca4ac4c373f363967948f2301
 EBUILD cinnamon-control-center-5.0.2.ebuild 2386 BLAKE2B 58c3555f2f224279ffc3f4e60930495f6dc53128731c501c351e749f7adabf23002a30c0164ec13b05128a7bdf727c1eeccaa56aa5e169eb0459704175579318 SHA512 68bc4a047d28ca8570794318d66970c79de7f6740b9499c4028cd010da1d021aa1713e392a97fbbb26deff23b214addae379f491d322b2cfc609d10bc8e1e66d
+EBUILD cinnamon-control-center-5.2.1.ebuild 2363 BLAKE2B 5b896e9520223203f6ac9f9ccaa8e28a235da184c378bfd345c6c84aceb8b1f1bcf958a1cc69e63b5dc7d9ab12bbaf767d270a5256b0b728dcae29a584e0af33 SHA512 8fadcf926de72405fdbe0f2ac1f7bad97260354de882654df1cc7ee991097ed87d7af75d2171ec98090b22b22f38b58732e9a3919377828c61f7b3c47824cfb3
 MISC metadata.xml 762 BLAKE2B 5a4411060287e76154bd0727feae76a45e8992077d7cbc6d1ad102d933246d98b3349bf0dc516f35d538e6c1d4a5d427e1561b646b628d408a5743666f5f2ca7 SHA512 c03709d9a1c8d678ce0957d08516e49f8affa6be2153f30607c0f1be7c29a1e00f4955f2112e82dc7c3b3e410a6dabf5ba2bdd9f3141b6a5299068598decd0c3
diff --git a/gnome-extra/cinnamon-control-center/cinnamon-control-center-4.8.2.ebuild b/gnome-extra/cinnamon-control-center/cinnamon-control-center-5.2.1.ebuild
index ffeb6732bad9..e8ca7c2831ca 100644
--- a/gnome-extra/cinnamon-control-center/cinnamon-control-center-4.8.2.ebuild
+++ b/gnome-extra/cinnamon-control-center/cinnamon-control-center-5.2.1.ebuild
@@ -3,7 +3,9 @@
 
 EAPI=7
 
-inherit meson xdg virtualx
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+
+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"
@@ -11,16 +13,16 @@ SRC_URI="https://github.com/linuxmint/cinnamon-control-center/archive/${PV}.tar.
 
 LICENSE="GPL-2+"
 SLOT="0"
-IUSE="+colord input_devices_wacom +networkmanager +modemmanager systemd test"
+IUSE="+colord input_devices_wacom +networkmanager +modemmanager gnome-online-accounts systemd test"
 REQUIRED_USE="modemmanager? ( networkmanager )"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 RESTRICT="test"
 
 COMMON_DEPEND="
 	>=dev-libs/glib-2.44.0:2
 	>=gnome-base/libgnomekbd-3.0.0:0=
-	>=gnome-extra/cinnamon-desktop-4.8:0=
-	>=gnome-extra/cinnamon-menus-4.8:0=
+	>=gnome-extra/cinnamon-desktop-5.2:0=
+	>=gnome-extra/cinnamon-menus-5.2:0=
 	media-libs/fontconfig
 	>=sys-auth/polkit-0.103
 	>=x11-libs/gdk-pixbuf-2.23.0:2
@@ -32,7 +34,7 @@ COMMON_DEPEND="
 	colord? ( >=x11-misc/colord-0.1.14:0= )
 	input_devices_wacom? (
 		>=dev-libs/libwacom-0.7
-		>=gnome-extra/cinnamon-settings-daemon-4.8:0=
+		>=gnome-extra/cinnamon-settings-daemon-5.2:0=
 		>=x11-libs/libXi-1.2 )
 	networkmanager? (
 		>=gnome-extra/nm-applet-1.2.0
@@ -40,6 +42,9 @@ COMMON_DEPEND="
 
 		modemmanager? ( >=net-misc/modemmanager-0.7 )
 	)
+	gnome-online-accounts? (
+		>=net-libs/gnome-online-accounts-3.18.0
+	)
 "
 RDEPEND="
 	${COMMON_DEPEND}
@@ -56,24 +61,23 @@ DEPEND="
 	x11-base/xorg-proto
 "
 BDEPEND="
+	${PYTHON_DEPS}
 	dev-util/glib-utils
-	>=dev-util/intltool-0.40.1
 	>=sys-devel/gettext-0.17
 	virtual/pkgconfig
 "
 
-PATCHES=(
-	# Fix build when modemmanager is disabled
-	# https://github.com/linuxmint/cinnamon-control-center/pull/257
-	"${FILESDIR}/${PN}-4.8.2-build-fix.patch"
-)
+src_prepare() {
+	default
+	python_fix_shebang meson_install_schemas.py
+}
 
 src_configure() {
 	local emesonargs=(
-		-Donlineaccounts=false
 		$(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
@@ -82,3 +86,13 @@ src_configure() {
 src_test() {
 	virtx meson_src_test
 }
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
diff --git a/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-4.8.2-build-fix.patch b/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-4.8.2-build-fix.patch
deleted file mode 100644
index 041a5d23e500..000000000000
--- a/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-4.8.2-build-fix.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From a9d7d0f7f36bc724ecb65019999fc1c4d671bcba Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= <felix@piedallu.me>
-Date: Thu, 31 Dec 2020 10:09:17 +0100
-Subject: [PATCH] Add ifdefs to prevent undefined reference to modem functions
- in network panel
-
----
- panels/network/cc-network-panel.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/panels/network/cc-network-panel.c b/panels/network/cc-network-panel.c
-index 8b28439..38d9842 100644
---- a/panels/network/cc-network-panel.c
-+++ b/panels/network/cc-network-panel.c
-@@ -29,7 +29,9 @@
- #include <NetworkManager.h>
- 
- #include "net-device.h"
-+#ifdef BUILD_MODEM
- #include "net-device-mobile.h"
-+#endif
- #include "net-device-wifi.h"
- #include "net-device-ethernet.h"
- #include "net-object.h"
-@@ -651,9 +653,11 @@ panel_add_device (CcNetworkPanel *panel, NMDevice *device)
-         case NM_DEVICE_TYPE_ETHERNET:
-                 device_g_type = NET_TYPE_DEVICE_ETHERNET;
-                 break;
-+        #ifdef BUILD_MODEM
-         case NM_DEVICE_TYPE_MODEM:
-                 device_g_type = NET_TYPE_DEVICE_MOBILE;
-                 break;
-+        #endif
-         case NM_DEVICE_TYPE_WIFI:
-                 device_g_type = NET_TYPE_DEVICE_WIFI;
-                 break;