gentoo new year resync : 01.01.2021

5 files changed, 2 insertions, 220 deletions

diff --git a/gnome-extra/cinnamon-settings-daemon/Manifest b/gnome-extra/cinnamon-settings-daemon/Manifest
index 8d72eefd253f..7409194777b5 100644
--- a/gnome-extra/cinnamon-settings-daemon/Manifest
+++ b/gnome-extra/cinnamon-settings-daemon/Manifest
@@ -1,8 +1,4 @@
-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.4.0.tar.gz 665615 BLAKE2B ef0666864a4735ff32d57a584004176c74d0f0ad4b077d3439e135c1d24c8d0606221a1b1693a0189972b462055478680b03917a6acfcdfdc80649f7ee0fc224 SHA512 dc4b0c570b345577bd20e85b44f4c99c3e3c88a2c2aea7c928e1fae931dc4dc07c6dd64c5917661434d35e3ae606c8189c3f77e0658925b5cc6ba2dc1885cb81
 DIST cinnamon-settings-daemon-4.6.4.tar.gz 668339 BLAKE2B 80e14d29a74004c1778e90d39c6ca892d3eee778134e43b8ea77cfec8cbad4f5ac21609cfbb9cdaab0b4d35b42e897223a5b9cdfd43de49d8112b8bc6fc45914 SHA512 77ddb637fd93fdfd59fb27c5a10082259fd99b4753ff36b3473db12f2fe0d19ee89d44c9e72f1ce9eab3f228c5fef418ce774dd78746d77b959ad9d8f93c1208
-EBUILD cinnamon-settings-daemon-4.4.0.ebuild 2325 BLAKE2B dc4e03e93769716d38f615166c0008f53067a1d25821fdf3ed843fff247acd9a6577812de9523477557afeadc70be4aae8ceafbfed19e203ae0bb18b44db48a6 SHA512 20273a9a2eb1189d9fb88592153d30aa6bbd16d65d70b153655f8392c173f98ffcf54fb66c2c3427b684417d0adb72a34b10cdb3d6cbd81a99f7bb65fb2f79be
-EBUILD cinnamon-settings-daemon-4.6.4.ebuild 2564 BLAKE2B fd49e531f11a97788f906e7f0f3ca691570f940541a9380c4c93e9f34aedd47ea24f1ec930af80116bd94c08754964590dceabd49c82ee65e3174b0005e0e89d SHA512 362e972f79f8307c2937d43fa97a6d56d5dd802aa4167b08a114a61058ef23b41ee553aacbaeacb546bc528523171a7c4da41716b4e89e0c20fae6f691c5458f
+EBUILD cinnamon-settings-daemon-4.6.4.ebuild 2563 BLAKE2B ee715bafa2e5fc1ff012077b78bbe97e4e7357404cb0755119221ea7082d614ebd15ebfb01210a8d4e0c9ba2fd3c495bcb31c60a79a482672f1465b69e1fe45d SHA512 631fbac5122c19911ba183d75fa44ae8a2aec436dffe5722cd936cf52515ee2a01993e5361b1537a16d14e30399a8b9f25e204f7e3a6d2be0429fac2c1b8456e
 MISC metadata.xml 473 BLAKE2B 653c7036ca8c17890778db69bab8294046cff31b4af5ee5148a65181183231cb83e4898eba4e9b3a10565ae6abebdc6b3720d2401c6f397861031d7d19df9521 SHA512 6b3a5f8882234339eddabdc46e3ed4fe34e985558f90e516f31f6e4953719bec084a5e4090f473ef7562ac81427c2a6a122c01020d3626b5aecec50bfd0aac7e
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
deleted file mode 100644
index c38c65257e36..000000000000
--- a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-4.4.0.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# 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
-	dev-libs/dbus-glib
-	>=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/glib-utils
-	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/cinnamon-settings-daemon-4.6.4.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-4.6.4.ebuild
index c3770c9a2fb7..c7e81528cef7 100644
--- a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-4.6.4.ebuild
+++ b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-4.6.4.ebuild
@@ -10,7 +10,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"
 RESTRICT="test"
 
diff --git a/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-3.0.1-optional.patch b/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-3.0.1-optional.patch
deleted file mode 100644
index c12d7636f967..000000000000
--- a/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-3.0.1-optional.patch
+++ /dev/null
@@ -1,84 +0,0 @@
---- a/configure.ac~	2016-05-10 17:30:40.000000000 +0200
-+++ b/configure.ac	2016-06-25 17:43:46.554279197 +0200
-@@ -259,14 +259,28 @@
- dnl - color
- dnl ---------------------------------------------------------------------------
- 
--PKG_CHECK_MODULES(COLOR, [colord >= 0.1.27 cinnamon-desktop >= $CINNAMON_DESKTOP_REQUIRED_VERSION libcanberra-gtk3])
-+AC_ARG_ENABLE(color,
-+              AS_HELP_STRING([--disable-color], [disable Colord support (default: enabled)]),,
-+              enable_color=yes)
-+build_color=false
-+if test x"$enable_color" != x"no" ; then
-+  PKG_CHECK_MODULES(COLOR, [colord >= 0.1.27 cinnamon-desktop >= $CINNAMON_DESKTOP_REQUIRED_VERSION libcanberra-gtk3])
-+  build_color=true
-+fi
-+
-+AM_CONDITIONAL(BUILD_COLOR, [test "x$build_color" = "xtrue"])
- 
- dnl ---------------------------------------------------------------------------
- dnl - wacom
- dnl ---------------------------------------------------------------------------
-+AC_ARG_ENABLE(wacom,
-+              AS_HELP_STRING([--disable-wacom], [disable Wacom support (default: auto)]),,
-+              enable_wacom=auto)
- build_wacom=false
--PKG_CHECK_MODULES(WACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst gudev-1.0 cinnamon-desktop xorg-wacom librsvg-2.0 >= $LIBRSVG_REQUIRED_VERSION gtk+-3.0 >= 3.8.0],
--                  [build_wacom="true" AC_DEFINE(HAVE_WACOM, 1, [Define if wacom is being build])], [build_wacom="false"])
-+if test x"$enable_wacom" != x"no" ; then
-+  PKG_CHECK_MODULES(WACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst gudev-1.0 cinnamon-desktop xorg-wacom librsvg-2.0 >= $LIBRSVG_REQUIRED_VERSION gtk+-3.0 >= 3.8.0],
-+                    [build_wacom="true" AC_DEFINE(HAVE_WACOM, 1, [Define if wacom is being build])], [build_wacom="false"])
-+fi
- 
- AM_CONDITIONAL(BUILD_WACOM, test "x$build_wacom" = "xtrue")
- 
-@@ -372,9 +386,15 @@
- dnl Check for logind
- dnl ====================================================================
- 
--PKG_CHECK_MODULES(LOGIND, [libsystemd-login], [have_logind=yes], [
-- PKG_CHECK_MODULES(LOGIND, [libsystemd], [have_logind=yes], [have_logind=no])
--])
-+AC_ARG_ENABLE([logind],
-+              AS_HELP_STRING([--disable-logind], [Do not check for logind]),
-+              [enable_logind=$enableval],
-+              [enable_logind=auto])
-+
-+have_logind=no
-+if test x$enable_logind != xno ; then
-+    PKG_CHECK_MODULES(LOGIND, [libsystemd-login], [have_logind=yes], [have_logind=no])
-+fi
- 
- if test x$have_logind = xyes; then
-     AC_DEFINE(HAVE_LOGIND, 1, [Define if logind is supported])
-@@ -595,6 +615,7 @@
-         LCMS DICT support:        ${have_new_lcms}
-         Libnotify support:        ${have_libnotify}
- 
-+        Colord support:           ${build_color}
-         Wacom support:            ${build_wacom}
- 
-         Smartcard support:        ${have_smartcard_support}
---- a/plugins/Makefile.am~	2016-05-10 17:30:40.000000000 +0200
-+++ b/plugins/Makefile.am	2016-06-25 17:44:30.021307677 +0200
-@@ -6,7 +6,6 @@
- 	automount	\
- 	background  \
- 	clipboard	\
--	color		\
- 	cursor		\
- 	dummy		\
-     datetime    \
-@@ -23,6 +22,12 @@
- 
- disabled_plugins = $(NULL)
- 
-+if BUILD_COLOR
-+enabled_plugins += color
-+else
-+disabled_plugins += color
-+endif
-+
- if BUILD_WACOM
- enabled_plugins += wacom
- else
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
deleted file mode 100644
index 90b63731f870..000000000000
--- a/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-4.4.0-systemd.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-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);
-     }