gentoo resync : 12.05.2022

4 files changed, 73 insertions, 105 deletions

diff --git a/gnome-extra/cinnamon-control-center/Manifest b/gnome-extra/cinnamon-control-center/Manifest
index 8c27b5c58da9..308167238330 100644
--- a/gnome-extra/cinnamon-control-center/Manifest
+++ b/gnome-extra/cinnamon-control-center/Manifest
@@ -1,5 +1,4 @@
-DIST cinnamon-control-center-5.0.2.tar.gz 3866962 BLAKE2B d292d610516647e149198cbfce652bfd094338612ef6b4765fcb80bd1fe15f2d643bbaa5343f1d79d57f3327c87a3256cfc3900493daf6f80569b1a0bacd821a SHA512 f47b88005ba1d7359ab99d80e99d2c42a93561ecddd98014f91674a5ae806b991169c88f3af6c8c187df23ebb8a9e12bbae5eefbfeaf2f3d087981192448c3c2
+AUX cinnamon-control-center-5.2.1-fix-libnma.patch 1922 BLAKE2B af679e2e7744dee5f600ef7474795e4362e9d019289785752979bdd2eebdb21b59bc00765ddb5cbdfd57dc7a106856b6916792d01f5b589b0fb9df2f87108fe1 SHA512 0323343831012e7724694818d9cbe65b7ba91effd06811ddfa4e4b75a44029f83f1497a3495facbfa05cbd0450e14b327d15c13cc357851172566a80f309708a
 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
+EBUILD cinnamon-control-center-5.2.1-r1.ebuild 2570 BLAKE2B 07724f5cf57160643e40eb463c68fffd61e960ae6e071958c8ff0cea3cad014e92fe92c3ff3a31d8ed46dd63ff87268d975584ccc467aff7149c047f2fe961fb SHA512 53ec4e294c9d98b170224e3f558232322611d4d428c86d943169263e7e0f201afe371c94428ab973da94b65a14950a0b580bbc4be1fd5f8b8c47827b7442dee0
 MISC metadata.xml 762 BLAKE2B 5a4411060287e76154bd0727feae76a45e8992077d7cbc6d1ad102d933246d98b3349bf0dc516f35d538e6c1d4a5d427e1561b646b628d408a5743666f5f2ca7 SHA512 c03709d9a1c8d678ce0957d08516e49f8affa6be2153f30607c0f1be7c29a1e00f4955f2112e82dc7c3b3e410a6dabf5ba2bdd9f3141b6a5299068598decd0c3
diff --git a/gnome-extra/cinnamon-control-center/cinnamon-control-center-5.0.2.ebuild b/gnome-extra/cinnamon-control-center/cinnamon-control-center-5.0.2.ebuild
deleted file mode 100644
index 47db2c39a177..000000000000
--- a/gnome-extra/cinnamon-control-center/cinnamon-control-center-5.0.2.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-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+"
-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.0:0=
-	>=gnome-extra/cinnamon-menus-5.0: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.0:0=
-		>=x11-libs/libXi-1.2 )
-	networkmanager? (
-		>=gnome-extra/nm-applet-1.2.0
-		>=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
-	>=dev-util/intltool-0.40.1
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-"
-
-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.ebuild b/gnome-extra/cinnamon-control-center/cinnamon-control-center-5.2.1-r1.ebuild
index e8ca7c2831ca..53c017c256aa 100644
--- a/gnome-extra/cinnamon-control-center/cinnamon-control-center-5.2.1.ebuild
+++ b/gnome-extra/cinnamon-control-center/cinnamon-control-center-5.2.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9,10} )
+PYTHON_COMPAT=( python3_{8,9,10} )
 
 inherit meson gnome2-utils python-any-r1 xdg virtualx
 
@@ -15,7 +15,7 @@ LICENSE="GPL-2+"
 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 ~riscv x86"
 RESTRICT="test"
 
 COMMON_DEPEND="
@@ -38,6 +38,7 @@ COMMON_DEPEND="
 		>=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 )
@@ -67,6 +68,12 @@ 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-libnma.patch b/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-5.2.1-fix-libnma.patch
new file mode 100644
index 000000000000..ae9caceed7f9
--- /dev/null
+++ b/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-5.2.1-fix-libnma.patch
@@ -0,0 +1,61 @@
+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,