gentoo resync : 29.01.2021

3 files changed, 123 insertions, 0 deletions

diff --git a/gnome-extra/cinnamon-control-center/Manifest b/gnome-extra/cinnamon-control-center/Manifest
index addc3fee5b6a..ea0fb08ffce8 100644
--- a/gnome-extra/cinnamon-control-center/Manifest
+++ b/gnome-extra/cinnamon-control-center/Manifest
@@ -1,3 +1,6 @@
+AUX cinnamon-control-center-4.8.2-build-fix.patch 1246 BLAKE2B c4e39834c7079573a363c9aa822a84839fdac5de2b9299545fafde9ed718e082ca3d37be63aa514fa43e60b33774d1cd1759202af6ade62b385c00a84cfb3e5a SHA512 3e3deadd7972ba4a642a8b69a809785ae34ff30cec1174e9d2a4ee8f9a27881e22629ae5b17dec92ba78c995bb012d1925d2a53d6acd89a155f17b3a74581df9
 DIST cinnamon-control-center-4.6.2.tar.gz 3877007 BLAKE2B f64ebfedc73eb92b96f81fb2743d818ec1602a550130d362eadba4c66a24a0e1f2bdffbe0bf80b23426ab57cead910c78b061b52e4eb82d0e6173d1da2d62749 SHA512 c759c14cc295ba15bde87ad1544d4bdef284d8e3fb8fbee528e9a258aaf83c6f6d76944042230725804ea6c05bd2cb5cbb59cb7507378b952221f381fc47075e
+DIST cinnamon-control-center-4.8.2.tar.gz 3865765 BLAKE2B 8e36888aec00252842bcdb3f29dd0728833c597260fdb6b2b160db455e900686086b1b04b393d58ec358f44aa64c14341e49738de7a85002a5e5d695974c578a SHA512 c64e554488b401291daf125cc5627201cac58d5e6efab697d0b9cac64b666a7d2a7e27f459bb560918876cc8cf5e3720c11a59cee70401e50682a4b82a20f1b5
 EBUILD cinnamon-control-center-4.6.2.ebuild 2425 BLAKE2B fb6fc81908ff306a1d552aa97623f10b3f96fcba7748f3a846eff4d60595afbafc9c2ee174012f47f6c7fa5cbb36fc92a223a6d298e70ec487d82a44970545e4 SHA512 29e9215b3e5c9bb4755777c09f6b90a425ee9c30b295ffcfdc693c0763962856915bd7629669252e0bb8eede546c48883a16d95ddb53956d3675bbd58f8405b7
+EBUILD cinnamon-control-center-4.8.2.ebuild 2154 BLAKE2B b956a520abe6024d3c47105e6231d49db258d92362d95559eabaf0eb7ae3c17dc842bd2c30cbf6e4ae017ae6d70c2ef0d1ee8c68320ce894312c372ca37a72b1 SHA512 b22c27cf6872717908298e5925d3a6eaaf4bd2497d26d3d2bb647d0d667cc20c6ae70ac1aebe60cc5c424564d9aa02cc12f231bde4b158d09ce6c52c1d2b0442
 MISC metadata.xml 608 BLAKE2B 4087b4540c1a4822bc57dbfa96b3f61f318c4e6112a530519dae25d8f41e3e7e0f10dc2b213c429eac05c54ae1ac6947766abd0def5d046881ccaa544a4d0cc2 SHA512 03d0eaa7834c6cc0bc89ced18ce558020641b4e802707178778e4aeaeedb5939333182289934ae61109226633bafc0be7d40f3a139d092da73426c266a3f5abe
diff --git a/gnome-extra/cinnamon-control-center/cinnamon-control-center-4.8.2.ebuild b/gnome-extra/cinnamon-control-center/cinnamon-control-center-4.8.2.ebuild
new file mode 100644
index 000000000000..6faf4e6c0aba
--- /dev/null
+++ b/gnome-extra/cinnamon-control-center/cinnamon-control-center-4.8.2.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson 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 systemd test"
+REQUIRED_USE="modemmanager? ( networkmanager )"
+KEYWORDS="~amd64 ~arm64 ~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=
+	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-4.8: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 )
+	)
+"
+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="
+	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_configure() {
+	local emesonargs=(
+		-Donlineaccounts=false
+		$(meson_use colord color)
+		$(meson_use modemmanager)
+		$(meson_use networkmanager)
+		$(meson_use input_devices_wacom wacom)
+	)
+	meson_src_configure
+}
+
+src_test() {
+	virtx meson_src_test
+}
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
new file mode 100644
index 000000000000..041a5d23e500
--- /dev/null
+++ b/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-4.8.2-build-fix.patch
@@ -0,0 +1,36 @@
+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;