gentoo resync : 15.06.2021

4 files changed, 61 insertions, 50 deletions

diff --git a/gnome-extra/cinnamon-control-center/Manifest b/gnome-extra/cinnamon-control-center/Manifest
index 415cc6e2735a..d4d9ca6de5d5 100644
--- a/gnome-extra/cinnamon-control-center/Manifest
+++ b/gnome-extra/cinnamon-control-center/Manifest
@@ -1,6 +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 434f1bf3193a4b900c464f567f20a03d54734dc8d66cea915880dec4921ea7edf5135e251325fdff88ba621e71e359f28aa2e6cd4160c00ccad81b6f0cf4b468 SHA512 bd7b0264dd456860b365dc3cf8b4cd997726062e219c85f4c5ab2714b052605f927869fb1ddcc92ca17cd4699df216f1ee4dcdc8e6ccdd1c8b1c2ddc250672dc
-EBUILD cinnamon-control-center-4.8.2.ebuild 2154 BLAKE2B b956a520abe6024d3c47105e6231d49db258d92362d95559eabaf0eb7ae3c17dc842bd2c30cbf6e4ae017ae6d70c2ef0d1ee8c68320ce894312c372ca37a72b1 SHA512 b22c27cf6872717908298e5925d3a6eaaf4bd2497d26d3d2bb647d0d667cc20c6ae70ac1aebe60cc5c424564d9aa02cc12f231bde4b158d09ce6c52c1d2b0442
-MISC metadata.xml 638 BLAKE2B 25be7d4f085c31019ad60e98002bf4fb7eac75710c4ae9357748839ea93da64f7bf87b5c1a19ba5d8ff5d248ab6d09285a78be89eeabb5e8a58a271704cd5ade SHA512 27b0859230c32c474a9b8f89fca13279678172ab2ff1a6724ccd7303fae14817844b7ee59d2ec2ce169c0ce3b3e462ca972d4d50a8f3a2069a84c3b534861ce7
+DIST cinnamon-control-center-5.0.1.tar.gz 3866795 BLAKE2B f9c88aa3ad585f9fd867055b247d3cbc7442fb1b4e205dbac7de889e8dd6faa3c2cdee9a6f98b877054ace9d3ff5694e469df3ca35481bd768e019bf6c611541 SHA512 3b3d64cf68ddc831a025e3f111ba5a58536ee6900a61a7bc86847b094f6d73292d56b98f6d94f1b2a03a25d820022383b4860f91d1ccd3f7e5327399da4b82cd
+EBUILD cinnamon-control-center-4.8.2.ebuild 2152 BLAKE2B d052a536b7af3cb8452c98d3c3273091335faf5d3106985c2ee2e8f2214a082fe7c487620467d35ec5c3f39e1f6cbbce67604ccf108312a95e8c1e89848ad02d SHA512 b4d36b1b3a76c6122d2bd041d871adfc637a1fc922a3d52816a83788291422515bc0a1571e164a22784c18190687343c964bd5440463cc70bcae335cf8241900
+EBUILD cinnamon-control-center-5.0.1.ebuild 2381 BLAKE2B d2be6a762c12c73fae2c1c1daba3ffa0d6e5583d305d306b21910681c1cd6402a1a346247c6495f6fca2ea8eb247a9e0b4444cb48e33a40b662ff1644b4e4f8f SHA512 7bdf8e0deec0cbcdb98f4233dbcda22c001ff45fd4146d87609fc7b0d55be5220ac78a5381563e22fd4eed817ab7fda2a15ab38b73f6e525ac1b4d45e714996a
+MISC metadata.xml 761 BLAKE2B 42172f2c3b7152b342295687f5d0e1b34e3a4caf367a0766a6c4c263b85ac4c411ed6c0283b58a3d110bc35205ec5d0f99bf21eb980bcf06c0f5aca167d24134 SHA512 f99fda20543f6fcc7ffe1ba8105084ac30e4b3caa29ccee52f9e8d3dba10f2861f3b35e72c25683a31924e455e024d5c78bff0fa24a27854eb27ac68bc4bac91
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
index 6faf4e6c0aba..ffeb6732bad9 100644
--- 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
@@ -13,7 +13,7 @@ LICENSE="GPL-2+"
 SLOT="0"
 IUSE="+colord input_devices_wacom +networkmanager +modemmanager systemd test"
 REQUIRED_USE="modemmanager? ( networkmanager )"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 RESTRICT="test"
 
 COMMON_DEPEND="
diff --git a/gnome-extra/cinnamon-control-center/cinnamon-control-center-4.6.2.ebuild b/gnome-extra/cinnamon-control-center/cinnamon-control-center-5.0.1.ebuild
index da31ffb6d75b..26539402f249 100644
--- a/gnome-extra/cinnamon-control-center/cinnamon-control-center-4.6.2.ebuild
+++ b/gnome-extra/cinnamon-control-center/cinnamon-control-center-5.0.1.ebuild
@@ -2,87 +2,98 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools eutils gnome2-utils xdg
+
+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/"
+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 debug input_devices_wacom +networkmanager +modemmanager systemd"
+IUSE="+colord input_devices_wacom +networkmanager +modemmanager gnome-online-accounts systemd test"
 REQUIRED_USE="modemmanager? ( networkmanager )"
-KEYWORDS="amd64 ~arm64 x86"
-
-# False positives caused by nested configure scripts
-QA_CONFIGURE_OPTIONS=".*"
+KEYWORDS="~amd64 ~arm64 ~x86"
+RESTRICT="test"
 
 COMMON_DEPEND="
-	>=dev-libs/glib-2.31:2
-	dev-libs/libxml2:2
-	>=gnome-base/libgnomekbd-2.91.91:0=
-	>=gnome-extra/cinnamon-desktop-4.6:0=
-	>=gnome-extra/cinnamon-menus-4.4:0=
-	>=gnome-extra/cinnamon-settings-daemon-4.4:0=
+	>=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
-	networkmanager? (
-		>=net-misc/networkmanager-1.2.0:=[modemmanager?]
-		>=gnome-extra/nm-applet-1.2.0
-		modemmanager? ( >=net-misc/modemmanager-0.7 )
-	)
 	>=sys-auth/polkit-0.103
 	>=x11-libs/gdk-pixbuf-2.23.0:2
-	>=x11-libs/gtk+-3.4.1:3
+	>=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
-		>=x11-libs/gtk+-3.8:3
+		>=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
+	)
 "
-# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
-# libgnomekbd needed only for gkbd-keyboard-display tool
-RDEPEND="${COMMON_DEPEND}
-	systemd? ( >=sys-apps/systemd-31 )
-	!systemd? ( app-admin/openrc-settingsd )
+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}
+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/autoconf-archive
 	>=sys-devel/gettext-0.17
 	virtual/pkgconfig
 "
 
 src_prepare() {
-	xdg_src_prepare
-	eautoreconf
-	gnome2_disable_deprecation_warning
+	default
+	python_fix_shebang meson_install_schemas.py
 }
 
 src_configure() {
-	econf \
-		--disable-maintainer-mode \
-		--enable-compile-warnings=minimum \
-		--disable-static \
-		--disable-onlineaccounts \
-		$(use_enable colord color) \
-		$(usex debug --enable-debug=yes ' ') \
-		$(use_enable input_devices_wacom wacom) \
-		$(use_enable networkmanager) \
-		$(use_enable modemmanager)
+	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_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
+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/metadata.xml b/gnome-extra/cinnamon-control-center/metadata.xml
index 26d10b9bc09a..94f82836a4a2 100644
--- a/gnome-extra/cinnamon-control-center/metadata.xml
+++ b/gnome-extra/cinnamon-control-center/metadata.xml
@@ -13,7 +13,7 @@
 		<remote-id type="github">linuxmint/cinnamon-control-center</remote-id>
 	</upstream>
 	<use>
-		<flag name="modemmanager">Enable support for mobile broadband devices
-			using <pkg>net-misc/modemmanager</pkg></flag>
+		<flag name="gnome-online-accounts">Enable configuration panel for <pkg>net-libs/gnome-online-accounts</pkg> accounts</flag>
+		<flag name="modemmanager">Enable support for mobile broadband devices using <pkg>net-misc/modemmanager</pkg></flag>
 	</use>
 </pkgmetadata>