gentoo resync : 15.06.2021

4 files changed, 31 insertions, 108 deletions

diff --git a/gnome-extra/cinnamon-settings-daemon/Manifest b/gnome-extra/cinnamon-settings-daemon/Manifest
index 8a86cf936f6e..8bb5c0c4d89f 100644
--- a/gnome-extra/cinnamon-settings-daemon/Manifest
+++ b/gnome-extra/cinnamon-settings-daemon/Manifest
@@ -1,7 +1,6 @@
-AUX cinnamon-settings-daemon-3.8.0-accountservice.patch 2213 BLAKE2B 2e867654ff2cb062434621e3f336aa9b833f31c2e7dfc214dbefc74bc2655b95376b945386e29873c9fc696b6e6c027fd6d2d1296c0002a0322e3a1f921c2d76 SHA512 87a15d3274129ea8fe9195f3abb0cfe1dc6d11337e5f2748197cb8b1ecd062e9da1967fe83f11fa7b98af2d95eef9fa4a3f6c55642be2715bcb76355a30fe8ca
 AUX cinnamon-settings-daemon-4.8.5-build-fixes.patch 4529 BLAKE2B 9e28834a8d2d091c816a74e6bc1c50260210e726251dad5ec310f68f450ccd5ec39057c15139218b65afef6e130efc8610b897f0720043a42cdc5702758458f7 SHA512 4f9fee4ec02b11789f387405f0b75f9eabdcc72d78e109b4015fe13575967ad7610a6ad208d8ee31e5b68531e6769d2a07ddc6a9b82db71bf03d7c70920b00a8
-DIST cinnamon-settings-daemon-4.6.4.tar.gz 668339 BLAKE2B 80e14d29a74004c1778e90d39c6ca892d3eee778134e43b8ea77cfec8cbad4f5ac21609cfbb9cdaab0b4d35b42e897223a5b9cdfd43de49d8112b8bc6fc45914 SHA512 77ddb637fd93fdfd59fb27c5a10082259fd99b4753ff36b3473db12f2fe0d19ee89d44c9e72f1ce9eab3f228c5fef418ce774dd78746d77b959ad9d8f93c1208
 DIST cinnamon-settings-daemon-4.8.5.tar.gz 662123 BLAKE2B b3ddd72e55c10c2cacc6dd29145e381395bd2ef68db7082a0770bb3eb647964041ed023d4a8357f2adcf5e8c9f8f713bac837809ed5926cc0434c2dc3e5c90ad SHA512 4a1d128b3f6faf3e2c13420d3569d4fd8cfaa1798ba5cf83fcb692662b9888d22f9f4bfb6fe18af59d0632583a2730a07e3ab48cca12c357b2d318d205fd7d0a
-EBUILD cinnamon-settings-daemon-4.6.4.ebuild 2562 BLAKE2B 9ca766a67b310e90461b3dfe889b75a20e0698ac5205600a09ce92b7e5d87676d84bcf901b4669db238a73fdbba5db79065e3b68ae0df2670821dab941d99bcc SHA512 f576c527dbb4aac5145e8b0b56f3a4f5e5c3382e9f5cb766abf29fa1a6fa652af99005d7d24a3d508d2c3341e65036046ff55f34fc5b258b82a52d1ba2d1c557
-EBUILD cinnamon-settings-daemon-4.8.5.ebuild 2350 BLAKE2B 70436726dbad58dab73be4f1263d35200c282a1ce7fe1821bd5a31b784c87024d4f860f334a1995579b984b7c49a5f646709312ea5d91a22ff7e92aabb3a414c SHA512 40e3de6507e938492a9e539b93b606ca50f36ff216896dbb78675aabf8e71bd1c22afda209647d7706376d9bb810843891f1ab46fc7c6141817bc013cfff244b
+DIST cinnamon-settings-daemon-5.0.1.tar.gz 662519 BLAKE2B d481dbde1cb1c39298296f8bde506921ce75ce0e70fe443b7c9101c62a4163b0457f4df5127fd676ebf535a0d83792d83a95b3b230a46e62b978ba65c6af2fee SHA512 81f618587576cc0e7a65e2658b6a4ff941ab0d87d0db2629427a79de7e82cc58ef1301568f2ed232aed0edf2e79def4a7ccb8f76becec1fe50b4b528d01c3c58
+EBUILD cinnamon-settings-daemon-4.8.5.ebuild 2348 BLAKE2B c463d0b1b7c5304f4c8a485cfa30b9dc1d50057edc9b909ba339f988d760ede512896604be52c2ad9871bd1e2cdc13b731021c7847d1201b98f6ac0b35f9352a SHA512 6fa3c7aa4b52e67eb94cab700c78c110205f846858771afdb4ef4f05b8b0452a7540f3647a99da03ee5423337909926188ebf5c2e6ae2b7968cb3b5e94c7df5d
+EBUILD cinnamon-settings-daemon-5.0.1.ebuild 2171 BLAKE2B 221635ba6ec02c68a0014dc63bdc47e75deb739a53f164152c3fd9c4470887ec7597d5fc06b95c5858a7a7ec1a8522011cac0206a4e3dd9b0067c0afe9296671 SHA512 dfa4d2689f60e09227155b5738b08eea15e522a6a2ba63b37d36880d04fadb5003938c25179935ee12bf17b68ab3f73b75754abf05c76abdffd5f9b9b83d1f15
 MISC metadata.xml 503 BLAKE2B 140d4e0ca8fc8c1706d856b305a12b9cf26d7efb2f7fa3292423e3617e109c42ddbf7b651923b5f84a1f56422a0b2e780ddce2573b5db2bd3f91a81ccd139c44 SHA512 0caf37ce7de312218834db1ee57f9a5e860eb34d32fd80cd96407b0f28b678c70de171a491695b32c47fd54cd1058a145e40bc64ecb3b51d47718f2215af1ed6
diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-4.8.5.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-4.8.5.ebuild
index 67d58faa2c5e..f28af6802a1c 100644
--- a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-4.8.5.ebuild
+++ b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-4.8.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/linuxmint/cinnamon-settings-daemon/archive/${PV}.tar
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="+colord cups input_devices_wacom smartcard systemd"
 
 RDEPEND="
diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-4.6.4.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-5.0.1.ebuild
index 41f1514f1b04..6e71b246e5ee 100644
--- a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-4.6.4.ebuild
+++ b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-5.0.1.ebuild
@@ -2,32 +2,34 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools eutils gnome2-utils virtualx xdg
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit meson gnome2-utils python-any-r1 xdg
 
 DESCRIPTION="Cinnamon's settings daemon"
-HOMEPAGE="https://projects.linuxmint.com/cinnamon/"
+HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon-settings-daemon"
 SRC_URI="https://github.com/linuxmint/cinnamon-settings-daemon/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="+colord cups input_devices_wacom smartcard systemd"
-RESTRICT="test"
 
-# udev is non-optional since lots of plugins, not just gudev, pull it in
 RDEPEND="
-	>=dev-libs/glib-2.38:2
+	>=dev-libs/glib-2.40.0:2
 	dev-libs/libgudev:=
 	>=gnome-base/libgnomekbd-3.6
-	>=gnome-extra/cinnamon-desktop-4.6:0=
+	>=gnome-extra/cinnamon-desktop-5.0:0=
 	media-libs/fontconfig
 	>=media-libs/lcms-2.2:2
-	media-libs/libcanberra:0=[gtk3]
+	media-libs/libcanberra:0=[gtk3,pulseaudio]
+	>=media-sound/pulseaudio-0.9.16[glib]
 	>=sys-apps/dbus-1.1.2
 	dev-libs/dbus-glib
 	>=sys-auth/polkit-0.97
 	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.9.10:3
+	>=x11-libs/gtk+-3.14.0:3
 	>=x11-libs/libnotify-0.7.3:0=
 	x11-libs/libX11
 	x11-libs/libXext
@@ -50,57 +52,36 @@ RDEPEND="
 	systemd? ( sys-apps/systemd:0= )
 	!systemd? ( sys-auth/elogind:0= )
 "
-DEPEND="${RDEPEND}
+DEPEND="
+	${RDEPEND}
 	dev-libs/libxml2:2
 	x11-base/xorg-proto
 "
 BDEPEND="
+	${PYTHON_DEPS}
 	dev-util/glib-utils
 	dev-util/gdbus-codegen
 	>=dev-util/intltool-0.37.1
 	virtual/pkgconfig
 "
 
-PATCHES=(
-	# Make account-services optional
-	"${FILESDIR}"/${PN}-3.8.0-accountservice.patch
-)
-
 src_prepare() {
-	xdg_src_prepare
-	eautoreconf
-	gnome2_disable_deprecation_warning
-
-	# Disable broken test
-	sed -e '/g_test_add_func ("\/color\/edid/d' \
-		-i plugins/color/gcm-self-test.c || die
+	default
+	python_fix_shebang install-scripts
 }
 
 src_configure() {
-	# no point in disabling gudev since other plugins pull it in
-	econf \
-		--disable-maintainer-mode \
-		--disable-schemas-compile \
-		--enable-compile-warnings=minimum \
-		--disable-static \
-		--enable-gudev \
-		--enable-polkit \
-		--enable-logind \
-		--disable-accountservice \
-		$(use_enable colord color) \
-		$(use_enable cups) \
-		$(use_enable smartcard smartcard-support) \
-		$(use_enable input_devices_wacom wacom)
-}
-
-src_test() {
-	virtx emake check
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-	dodoc MAINTAINERS
+	# gudev not optional on Linux platforms
+	local emesonargs=(
+		-Duse_gudev=enabled
+		-Duse_polkit=enabled
+		-Duse_logind=enabled
+		$(meson_feature colord use_color)
+		$(meson_feature cups use_cups)
+		$(meson_feature smartcard use_smartcard)
+		$(meson_feature input_devices_wacom use_wacom)
+	)
+	meson_src_configure
 }
 
 pkg_postinst() {
diff --git a/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-3.8.0-accountservice.patch b/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-3.8.0-accountservice.patch
deleted file mode 100644
index c12f2730ceae..000000000000
--- a/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-3.8.0-accountservice.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 15b1c1488f28e69cee86ff25bf0c95ebf5245add Mon Sep 17 00:00:00 2001
-From: Kristian Fiskerstrand <kf@sumptuouscapital.com>
-Date: Sat, 30 Jun 2018 22:35:52 +0200
-Subject: [PATCH] Make account service optional
-
----
- configure.ac                                | 6 ++++++
- plugins/background/csd-background-manager.c | 4 ++--
- 2 files changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index af5d3a4..a30126e 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -166,6 +166,12 @@ else
- fi
- AM_CONDITIONAL(HAVE_GUDEV, test x$have_gudev = xyes)
- 
-+AC_ARG_ENABLE(accountservice, AS_HELP_STRING([--disable-accountservice],[Disable accountservice]), enable_accountservice=$enableval)
-+
-+if test x$enable_accountservice = "xyes"; then
-+	AC_DEFINE(HAVE_ACCOUNTSERVICE, 1, [define if accountservice is available])
-+fi
-+
- dnl ---------------------------------------------------------------------------
- dnl - common
- dnl ---------------------------------------------------------------------------
-diff --git a/plugins/background/csd-background-manager.c b/plugins/background/csd-background-manager.c
-index 282094a..a692c6e 100644
---- a/plugins/background/csd-background-manager.c
-+++ b/plugins/background/csd-background-manager.c
-@@ -135,9 +135,9 @@ settings_change_event_cb (GSettings            *settings,
- {
-         gnome_bg_load_from_preferences (manager->priv->bg,
-                                         manager->priv->settings);
--
-+#ifdef HAVE_ACCOUNTSERVICE
-         gnome_bg_set_accountsservice_background (gnome_bg_get_filename (manager->priv->bg));
--
-+#endif
-         return FALSE;
- }
-
-diff --git a/plugins/background/csd-background-manager.c
-b/plugins/background/csd-background-manager.c
-index a692c6e..a99b478 100644
---- a/plugins/background/csd-background-manager.c
-+++ b/plugins/background/csd-background-manager.c
-@@ -186,8 +186,9 @@ setup_bg (CsdBackgroundManager *manager)
-         watch_bg_preferences (manager);
-         gnome_bg_load_from_preferences (manager->priv->bg,
-                                         manager->priv->settings);
--
-+#ifdef HAVE_ACCOUNTSERVICE
-         gnome_bg_set_accountsservice_background (gnome_bg_get_filename (manager->priv->bg));
-+#endif
- }