gentoo resync : 30.05.2020

4 files changed, 140 insertions, 1 deletions

diff --git a/gnome-extra/cinnamon-settings-daemon/Manifest b/gnome-extra/cinnamon-settings-daemon/Manifest
index 8e9f36075a6f..4c67556488a1 100644
--- a/gnome-extra/cinnamon-settings-daemon/Manifest
+++ b/gnome-extra/cinnamon-settings-daemon/Manifest
@@ -1,5 +1,8 @@
 AUX cinnamon-settings-daemon-3.0.1-optional.patch 3242 BLAKE2B 6f2b64711df08f037155360728ad3f1da4184e2531e2b516b1e656379a9fc8edc26757a9b758f435c227b68c8a9936654b2147602f41b38e6eb198b4045bd10c SHA512 77d0e4c7f72b43b14e5d3106fde06d119f2e20b372e5cfa3565b67cdba6d1150fc1c59866df7db85307d1b3d8b0b2c90d5e04acbb6429e801a3aedd6135f72e8
 AUX cinnamon-settings-daemon-3.8.0-accountservice.patch 2213 BLAKE2B 2e867654ff2cb062434621e3f336aa9b833f31c2e7dfc214dbefc74bc2655b95376b945386e29873c9fc696b6e6c027fd6d2d1296c0002a0322e3a1f921c2d76 SHA512 87a15d3274129ea8fe9195f3abb0cfe1dc6d11337e5f2748197cb8b1ecd062e9da1967fe83f11fa7b98af2d95eef9fa4a3f6c55642be2715bcb76355a30fe8ca
+AUX cinnamon-settings-daemon-4.4.0-systemd.patch 1733 BLAKE2B 950b165f39b6a36cb9ebe47a76791dd4526e8ca4a883bc8f9d0ac93cd8f428ac232c4107d39ee98084292742ef465dab37bbc2059d67b1e2c1cc8cd485e5ac58 SHA512 f52fe67e57eb5213899ec249022b27cdc9ef94bf826604baba8ad6727e30ca0dc6f88a452640ae8536b23f33220d2cadc638b3132360d3d93d289e0ab236556e
 DIST cinnamon-settings-daemon-4.0.2.tar.gz 662735 BLAKE2B 158e2ee120e2b359c6d84aa52c6b2c9214148fcf48cdc8ed9c777344f21ce82b5c3e4d0b358046abb1de8fc23a43b7cced02b77b43c1230fc2d97db58423e125 SHA512 3e51628339ae7766c37090c82a7550e2f925843ca62ef9cca606568c9771a8f16035735b3db612aae0938553fd37fb6eaf8d30437baa501160221d1b71d0e94e
+DIST cinnamon-settings-daemon-4.4.0.tar.gz 665615 BLAKE2B ef0666864a4735ff32d57a584004176c74d0f0ad4b077d3439e135c1d24c8d0606221a1b1693a0189972b462055478680b03917a6acfcdfdc80649f7ee0fc224 SHA512 dc4b0c570b345577bd20e85b44f4c99c3e3c88a2c2aea7c928e1fae931dc4dc07c6dd64c5917661434d35e3ae606c8189c3f77e0658925b5cc6ba2dc1885cb81
 EBUILD cinnamon-settings-daemon-4.0.2.ebuild 2156 BLAKE2B 13e3cf48d890322d391cfd2965e45230933d3e876200f0a47d28c95c84ba261be3077eb7e7aa12b4c91c1fb0ddb5b88104ac7d528482377eb8da2ef5303cb19c SHA512 4828186da8669038e71167651b4ca62a73144bc040e01da2593ae270c47d6195ecac0a5ef80cf1e941072eee81c697d6339fc2006ce78fabe8aa778c28f1202b
-MISC metadata.xml 351 BLAKE2B 7693637c46e37d76b95be989ad884a1792426afe83bf8dd4dfcb3b92bca1d5d8c0cdd5cb8df5e14db699064a172136a45ab0673fc138c170f194a4f79f690e1e SHA512 6939d1b669b5c2cc6cdf0a539a632e5b69546e1ba53d88b61c511eb4b7a7465bcf68dd5f132f55241e7615690184f047df98881605ed2632c43cf2e06848ba33
+EBUILD cinnamon-settings-daemon-4.4.0.ebuild 2284 BLAKE2B e0f0b0400f96b26d38975c0333f5cf879e60888fd376b786d116bc790a0def28a47f6e548dd50f1b2526ab5ae170fe1ccf32733d441aee76ef8dd4701948d270 SHA512 9736bf7482e3ec2b4c8534b84ba095a8862d2d730a92021df8d3ea3235d1f6f49f1cace452568c193fcbaa64b5db2f18a9f470c55d5bd9e86bf34c7f7bbea9fb
+MISC metadata.xml 586 BLAKE2B 0f62c9c3c7905386c186760fff8d551961b3897728f123d4387d884ebb9239bc299dc4b63fb8f89f0647ca1d15720959cb93a5127db04f7ee87860655d4c5f3c SHA512 17fcc914b562a15a2142c55b6908fdd602678b823528d8b148405e197be631cad258addf54d2b61bca7b1455902ed70cf5601e79c48011b0b085961f3b2b628a
diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-4.4.0.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-4.4.0.ebuild
new file mode 100644
index 000000000000..674a8d9e5626
--- /dev/null
+++ b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-4.4.0.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+
+inherit autotools eutils gnome2 virtualx
+
+DESCRIPTION="Cinnamon's settings daemon"
+HOMEPAGE="https://projects.linuxmint.com/cinnamon/"
+SRC_URI="https://github.com/linuxmint/cinnamon-settings-daemon/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~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/libgudev:=
+	>=gnome-base/libgnomekbd-3.6
+	>=gnome-extra/cinnamon-desktop-4.4:0=
+	media-libs/fontconfig
+	>=media-libs/lcms-2.2:2
+	media-libs/libcanberra:0=[gtk3]
+	>=sys-apps/dbus-1.1.2
+	>=sys-auth/polkit-0.97
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.9.10:3
+	>=x11-libs/libnotify-0.7.3:0=
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	>=x11-libs/libxklavier-5.0
+	>=sys-power/upower-0.9.11
+
+	colord? ( >=x11-misc/colord-0.1.27:= )
+	cups? (
+		>=net-print/cups-1.4[dbus]
+		app-admin/system-config-printer
+		net-print/cups-pk-helper )
+	input_devices_wacom? (
+		>=dev-libs/libwacom-0.7
+		>=gnome-base/librsvg-2.36.2
+		x11-drivers/xf86-input-wacom
+		x11-libs/libXtst )
+	smartcard? ( >=dev-libs/nss-3.11.2 )
+	systemd? ( sys-apps/systemd:0= )
+	!systemd? ( sys-auth/elogind:0= )
+"
+DEPEND="${RDEPEND}
+	dev-util/gdbus-codegen
+	dev-libs/libxml2:2
+	>=dev-util/intltool-0.37.1
+	x11-base/xorg-proto
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	# make colord and wacom optional
+	eapply "${FILESDIR}"/${PN}-3.0.1-optional.patch
+	eapply "${FILESDIR}"/${PN}-3.8.0-accountservice.patch
+	eapply "${FILESDIR}"/${PN}-4.4.0-systemd.patch
+
+	# Disable broken test
+	sed -e '/g_test_add_func ("\/color\/edid/d' \
+		-i plugins/color/gcm-self-test.c || die
+
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# no point in disabling gudev since other plugins pull it in
+	gnome2_src_configure \
+		--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
+}
diff --git a/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-4.4.0-systemd.patch b/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-4.4.0-systemd.patch
new file mode 100644
index 000000000000..90b63731f870
--- /dev/null
+++ b/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-4.4.0-systemd.patch
@@ -0,0 +1,36 @@
+From 4c19a41429524a2da202b919a335a646103da0fd Mon Sep 17 00:00:00 2001
+From: Leigh Scott <leigh123linux@gmail.com>
+Date: Wed, 11 Dec 2019 23:29:08 +0000
+Subject: [PATCH] Restore old check for logind
+
+---
+ cinnamon-settings-daemon/cinnamon-settings-session.c | 2 +-
+ plugins/common/csd-power-helper.c                    | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/cinnamon-settings-daemon/cinnamon-settings-session.c b/cinnamon-settings-daemon/cinnamon-settings-session.c
+index adbe1e7..4d52b21 100644
+--- a/cinnamon-settings-daemon/cinnamon-settings-session.c
++++ b/cinnamon-settings-daemon/cinnamon-settings-session.c
+@@ -378,7 +378,7 @@ cinnamon_settings_session_init (CinnamonSettingsSession *session)
+ 	session->priv = CINNAMON_SETTINGS_SESSION_GET_PRIVATE (session);
+ 
+ #ifdef HAVE_LOGIND
+-    if (access("/run/systemd/system/", F_OK) == 0) {    // sd_booted ()
++    if (access("/run/systemd/seats/", F_OK) == 0) {    // sd_booted ()
+         sd_pid_get_session (getpid(), &session->priv->session_id);
+         session->priv->sd_source = sd_source_new ();
+         g_source_set_callback (session->priv->sd_source, sessions_changed, session, NULL);
+diff --git a/plugins/common/csd-power-helper.c b/plugins/common/csd-power-helper.c
+index 5a83072..82c0b22 100644
+--- a/plugins/common/csd-power-helper.c
++++ b/plugins/common/csd-power-helper.c
+@@ -41,7 +41,7 @@ use_logind (void)
+     static gsize once_init_value = 0;
+ 
+     if (g_once_init_enter (&once_init_value)) {
+-        should_use_logind = access("/run/systemd/system/", F_OK) == 0; // sd_booted ()
++        should_use_logind = access("/run/systemd/seats/", F_OK) == 0; // sd_booted ()
+ 
+         g_once_init_leave (&once_init_value, 1);
+     }
diff --git a/gnome-extra/cinnamon-settings-daemon/metadata.xml b/gnome-extra/cinnamon-settings-daemon/metadata.xml
index da9442eb0216..966474ecf7be 100644
--- a/gnome-extra/cinnamon-settings-daemon/metadata.xml
+++ b/gnome-extra/cinnamon-settings-daemon/metadata.xml
@@ -5,6 +5,14 @@
 		<email>cinnamon@gentoo.org</email>
 		<name>Cinnamon Project</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>sparky@bluefang-logic.com</email>
+		<name>Matthew Turnbull</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">linuxmint/cinnamon-settings-daemon</remote-id>
 	</upstream>