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

5 files changed, 14 insertions, 236 deletions

diff --git a/gnome-extra/cinnamon-control-center/Manifest b/gnome-extra/cinnamon-control-center/Manifest
index fa7d4185b176..2fe6a07e5ca3 100644
--- a/gnome-extra/cinnamon-control-center/Manifest
+++ b/gnome-extra/cinnamon-control-center/Manifest
@@ -1,9 +1,6 @@
-AUX cinnamon-control-center-5.2.1-fix-libgnomekbd.patch 1929 BLAKE2B b541f8105a18316961ab53471de074f0e610aaeb96fb67c682e61ba8ca677eecce5fceddb3e7989d3d259943212da9d7e565d4999552a9664cb225484a2c1f1f SHA512 dd62de8e8284c650304ae1681ea9ddf1bcfde197e19fcecc44442844ced4203d5c503f08a19103330a992040ae5ae3b8005d6898fce91b9336d59a0a3ffe774d
-AUX cinnamon-control-center-5.2.1-fix-libnma.patch 1922 BLAKE2B af679e2e7744dee5f600ef7474795e4362e9d019289785752979bdd2eebdb21b59bc00765ddb5cbdfd57dc7a106856b6916792d01f5b589b0fb9df2f87108fe1 SHA512 0323343831012e7724694818d9cbe65b7ba91effd06811ddfa4e4b75a44029f83f1497a3495facbfa05cbd0450e14b327d15c13cc357851172566a80f309708a
 AUX cinnamon-control-center-5.6.0-fix-icon-build.patch 1670 BLAKE2B 3cc64e45c8d0b5677e911389cfed7f42c02e61ca55240c49efadde39d179f27c44af6c90b98f46b7e5a769a4a75c163f43f26aec6f10eb80c924074bc2b7a880 SHA512 8233b225a744e79ebce2c78b19df96eff49fb37cda445777a5e7f2c3896ebc5ca194ad6ffe27b1c1ab7df65c55c3389796d89590766a6e757f7e404d4741c635
-DIST cinnamon-control-center-5.2.1.tar.gz 3863530 BLAKE2B 826494b8f8a4dead32d6031d7b4b2a44d357b3e8fedf1065b61193caa86ad433ba68fd9344f70bbce77bb94e086ae15f8854dc73916a5f60c49b1b2bd9e7101c SHA512 d322a9b460f13c697d327dda75a3ea16dd96414ed52ffbcdfc19479533178585da795c064ae441b36ef02f1aa779704db039328ca4ac4c373f363967948f2301
 DIST cinnamon-control-center-5.6.0.tar.gz 3872303 BLAKE2B c0db21dbad031e3a3e06ea2f6253421c548b993eef323e2be1ad131e0a8e980b7b3a93d9a7a6d1feaf13ebe8c5f77fd286f0cb56b7d22c7cb447e46178c6f328 SHA512 336c554c93212c28df4f163b6a06d2c287901c167dc8e5563dbb44ddd69119db36d15086b6b1e78ff1b199424a4a24ac9605d59877a3f8174fd1f406a0f7ca4f
-EBUILD cinnamon-control-center-5.2.1-r2.ebuild 2592 BLAKE2B cf75a9416107770b76a4f88baff6f3788ff054556b518406099e13cd90f92fc7b7778d8c5a3435fdc7ad9649452490c649fb1e743f442a01a5757e4e8d348ea9 SHA512 3805deec698606f2c9f8849eb63879c13bcbf311262f5fcdd14e45699351750c6daff2d93ed04ef249b6a81deb23b3ab9162b17e146f01d154641376e5302ec3
-EBUILD cinnamon-control-center-5.2.1-r3.ebuild 2772 BLAKE2B 6b69847a6dec8c5a4ab3699915a24874a55c9e1657cdf8f50a95eab039318b69bbd3402102a240a97a4d49243737cb469fc2e96ef52ff2b769450aa04df3cde1 SHA512 a6cd2f2a1cccbf46861de7cc61c578edb1dbe6c19ea0207b5c5bfd942ce6cce750519ac2c477042883d1e8fefd9ae6fa13c5e36b59bdb1acb1abe0fa786034c2
+DIST cinnamon-control-center-5.6.1.tar.gz 3874429 BLAKE2B 53344aead6c5e31eeadf70e26a2ae61db930e595b5e546ac08b57029c924e4105d126fe6a27cd3ef7d4a59b51f83e0790dfaf815d9a3addfa5c496eab82d4537 SHA512 8679cc3afab77605b5e949e58cacb55782fca0ebc41991de7421b12fcd6c85991b6e4f5c70611753724ff47ea4eb39339ea4cea29e3f4e3399d9141fe4c80c7f
 EBUILD cinnamon-control-center-5.6.0.ebuild 2587 BLAKE2B 44871f2a792a86299df44dc1224928e2fee324b49f033ae8c8222b504b2c0739e4809ea286303f9cf960db0738cc176bb6ffc99a2d10343f37b0e4e047ac133f SHA512 ef5d6bcb85f3f3ec2e471267e572404d284a017a4b80697cbf18fc4121272bc906a2a9112496b494eba34dcb0354e20a093b918b829508b739269fa91cd39faa
+EBUILD cinnamon-control-center-5.6.1.ebuild 2485 BLAKE2B 0702336caa5d3a49ff31ad05373d667db3a49a59aa572ef2dcbd6f09fbf5634b2ef4af693a0e7c1137d7ca8191b97f4c235eb67a209fa67bd5f344e3c32afe2a SHA512 6565295613f3895d3af9ee6c5760a79bd7ce065b6b7ec456d194bf05c8c2b9ad54fe9add3d4cae7e63e9d09f4cce9a2cfa813eb57fad0b4b6dc064df29eb31c2
 MISC metadata.xml 762 BLAKE2B 5a4411060287e76154bd0727feae76a45e8992077d7cbc6d1ad102d933246d98b3349bf0dc516f35d538e6c1d4a5d427e1561b646b628d408a5743666f5f2ca7 SHA512 c03709d9a1c8d678ce0957d08516e49f8affa6be2153f30607c0f1be7c29a1e00f4955f2112e82dc7c3b3e410a6dabf5ba2bdd9f3141b6a5299068598decd0c3
diff --git a/gnome-extra/cinnamon-control-center/cinnamon-control-center-5.2.1-r3.ebuild b/gnome-extra/cinnamon-control-center/cinnamon-control-center-5.2.1-r3.ebuild
deleted file mode 100644
index 4f9aebd7f2ef..000000000000
--- a/gnome-extra/cinnamon-control-center/cinnamon-control-center-5.2.1-r3.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{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"
-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 ~riscv x86"
-RESTRICT="test"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.44.0:2
-	>=gnome-base/libgnomekbd-3.0.0: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
-	>=x11-libs/gtk+-3.16.0:3
-	>=x11-libs/libnotify-0.7.3:0=
-	x11-libs/libX11
-	>=x11-libs/libxklavier-5.1
-
-	colord? ( >=x11-misc/colord-0.1.14:0= )
-	input_devices_wacom? (
-		>=dev-libs/libwacom-0.7:=
-		>=gnome-extra/cinnamon-settings-daemon-5.2:0=
-		>=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
-"
-
-PATCHES=(
-	# Fix >=libnma-1.8.34
-	# https://github.com/linuxmint/cinnamon-control-center/commit/0f4d212874c4fbee18b860963d0a5c7bd54dcfd1
-	"${FILESDIR}"/${PN}-5.2.1-fix-libnma.patch
-
-	# Fix >=libgnomekbd-3.28
-	# https://github.com/linuxmint/cinnamon-control-center/commit/8cb73375e66b93da18f7bde728d4a832c07aada4
-	"${FILESDIR}"/${PN}-5.2.1-fix-libgnomekbd.patch
-)
-
-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-5.2.1-r2.ebuild b/gnome-extra/cinnamon-control-center/cinnamon-control-center-5.6.1.ebuild
index 015bff834cc5..f500f43017f9 100644
--- a/gnome-extra/cinnamon-control-center/cinnamon-control-center-5.2.1-r2.ebuild
+++ b/gnome-extra/cinnamon-control-center/cinnamon-control-center-5.6.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{9,10} )
+PYTHON_COMPAT=( python3_{10..11} )
 
 inherit meson gnome2-utils python-any-r1 xdg virtualx
 
@@ -15,31 +15,35 @@ 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 ~riscv x86"
+KEYWORDS="~amd64 ~arm64 ~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.2:0=
-	>=gnome-extra/cinnamon-menus-5.2:0=
+	>=gnome-extra/cinnamon-desktop-5.6:0=
+	>=gnome-extra/cinnamon-menus-5.6
 	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
-	>=x11-libs/libnotify-0.7.3:0=
+	>=dev-libs/libgudev-232
+	>=x11-libs/libnotify-0.7.3
+	x11-libs/cairo
 	x11-libs/libX11
-	>=x11-libs/libxklavier-5.1
+	>=x11-libs/libxklavier-5.1:=
+	x11-libs/pango
 
 	colord? ( >=x11-misc/colord-0.1.14:0= )
 	input_devices_wacom? (
 		>=dev-libs/libwacom-0.7:=
-		>=gnome-extra/cinnamon-settings-daemon-5.2:0=
 		>=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?]
+		>=net-misc/networkmanager-1.2.0[modemmanager?]
 
 		modemmanager? ( >=net-misc/modemmanager-0.7 )
 	)
@@ -68,12 +72,6 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
-PATCHES=(
-	# Fix >=libnma-1.8.34
-	# https://github.com/linuxmint/cinnamon-control-center/commit/0f4d212874c4fbee18b860963d0a5c7bd54dcfd1
-	"${FILESDIR}"/${PN}-5.2.1-fix-libnma.patch
-)
-
 src_prepare() {
 	default
 	python_fix_shebang meson_install_schemas.py
diff --git a/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-5.2.1-fix-libgnomekbd.patch b/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-5.2.1-fix-libgnomekbd.patch
deleted file mode 100644
index 389c97b6085c..000000000000
--- a/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-5.2.1-fix-libgnomekbd.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-https://bugs.gentoo.org/870151
-https://github.com/linuxmint/cinnamon-control-center/pull/297
-
-From 8cb73375e66b93da18f7bde728d4a832c07aada4 Mon Sep 17 00:00:00 2001
-From: Eicke Herbertz <wolletd@posteo.de>
-Date: Tue, 23 Aug 2022 19:28:57 +0200
-Subject: [PATCH] region panel: add keys removed from libgnomekbd's API (#297)
-
-in version 3.28
----
- panels/region/cinnamon-region-panel-xkb.c | 6 ++++++
- panels/region/cinnamon-region-panel-xkb.h | 5 +++++
- 2 files changed, 11 insertions(+)
-
-diff --git a/panels/region/cinnamon-region-panel-xkb.c b/panels/region/cinnamon-region-panel-xkb.c
-index b7417e2e..3152471b 100644
---- a/panels/region/cinnamon-region-panel-xkb.c
-+++ b/panels/region/cinnamon-region-panel-xkb.c
-@@ -36,6 +36,12 @@
- 
- #define GKBD_CONFIG_KEY_LOAD_EXTRA_ITEMS "load-extra-items"
- 
-+// These were removed from the API of libgnomekbd in version 3.28
-+const gchar GKBD_DESKTOP_CONFIG_KEY_DEFAULT_GROUP[] = "default-group";
-+const gchar GKBD_DESKTOP_CONFIG_KEY_GROUP_PER_WINDOW[] = "group-per-window";
-+const gchar GKBD_KEYBOARD_CONFIG_KEY_LAYOUTS[] = "layouts";
-+const gchar GKBD_KEYBOARD_CONFIG_KEY_OPTIONS[] = "options";
-+
- XklEngine *engine;
- XklConfigRegistry *config_registry;
- 
-diff --git a/panels/region/cinnamon-region-panel-xkb.h b/panels/region/cinnamon-region-panel-xkb.h
-index bd7b47d3..cfa396de 100644
---- a/panels/region/cinnamon-region-panel-xkb.h
-+++ b/panels/region/cinnamon-region-panel-xkb.h
-@@ -36,6 +36,11 @@ extern GSettings *xkb_keyboard_settings;
- extern GSettings *xkb_desktop_settings;
- extern GkbdKeyboardConfig initial_config;
- 
-+extern const gchar GKBD_DESKTOP_CONFIG_KEY_DEFAULT_GROUP[];
-+extern const gchar GKBD_DESKTOP_CONFIG_KEY_GROUP_PER_WINDOW[];
-+extern const gchar GKBD_KEYBOARD_CONFIG_KEY_LAYOUTS[];
-+extern const gchar GKBD_KEYBOARD_CONFIG_KEY_OPTIONS[];
-+
- extern void setup_xkb_tabs (GtkBuilder * dialog);
- 
- extern void xkb_layouts_fill_selected_tree (GtkBuilder * dialog);
diff --git a/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-5.2.1-fix-libnma.patch b/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-5.2.1-fix-libnma.patch
deleted file mode 100644
index ae9caceed7f9..000000000000
--- a/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-5.2.1-fix-libnma.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-https://bugs.gentoo.org/840317
-https://github.com/linuxmint/cinnamon/issues/10616
-
-From 0f4d212874c4fbee18b860963d0a5c7bd54dcfd1 Mon Sep 17 00:00:00 2001
-From: Michael Webster <miketwebster@gmail.com>
-Date: Mon, 31 Jan 2022 08:56:28 -0500
-Subject: [PATCH] network: Remove old workaround for openvpn widgets.
-
-I can't reproduce the original issue anymore, and NMACertChooser
-is removed in network-manager-openvpn 1.8.34.
-
-Fixes #10616
-
-ref:
-6db4961fd3a002182984d0e71ec364c9befdd93b
----
- meson.build                       |  2 --
- panels/network/cc-network-panel.c | 10 ----------
- 2 files changed, 12 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index f1f213b..c4d7d86 100644
---- a/meson.build
-+++ b/meson.build
-@@ -56,8 +56,6 @@ else
-   libnma= dependency('', required: false)
- endif
- 
--config.set('HAVE_NMA_18', libnm.version().version_compare('>=1.8.0'))
--
- if get_option('modemmanager')
-   if not get_option('networkmanager')
-     error('*** NetworkManager is required by ModemManager ***')
-diff --git a/panels/network/cc-network-panel.c b/panels/network/cc-network-panel.c
-index a4289de..d1925e4 100644
---- a/panels/network/cc-network-panel.c
-+++ b/panels/network/cc-network-panel.c
-@@ -47,10 +47,6 @@
- #include <libmm-glib.h>
- #endif
- 
--#ifdef HAVE_NMA_18
--#include <nma-cert-chooser.h>
--#endif
--
- CC_PANEL_REGISTER (CcNetworkPanel, cc_network_panel)
- 
- #define NETWORK_PANEL_PRIVATE(o) \
-@@ -1244,12 +1240,6 @@ cc_network_panel_init (CcNetworkPanel *panel)
-                 return;
-         }
- 
--#ifdef HAVE_NMA_18
--        /* some newer VPN plugins pre-require internal resources from libnma */
--        /* this solution is really ugly, but works clean */
--        gtk_widget_destroy (nma_cert_chooser_new ("dummy", NMA_CERT_CHOOSER_FLAG_NONE));
--#endif
--
-         panel->priv->cancellable = g_cancellable_new ();
- 
-         panel->priv->treeview = GTK_WIDGET (gtk_builder_get_object (panel->priv->builder,