gentoo resync : 29.01.2021

3 files changed, 236 insertions, 0 deletions

diff --git a/gnome-extra/cinnamon-settings-daemon/Manifest b/gnome-extra/cinnamon-settings-daemon/Manifest
index 300324aef06b..fde98d5b5808 100644
--- a/gnome-extra/cinnamon-settings-daemon/Manifest
+++ b/gnome-extra/cinnamon-settings-daemon/Manifest
@@ -1,4 +1,7 @@
 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 2221 BLAKE2B 05986492eb00c87560c61741b53d0c8f4e435cd7bb7a31f00f461ff1a44305489ce16de2cc565e73a530c0cf73e195c915ecd11f134d18655726f5e9b9e06c3e SHA512 024bb484e2e5f11b79882c36248f730b8a13cb076f70b9b341f5a0870698a2371820e0ee85166f6fb339fbeb825457af0e184c1b5091f35330bbacdda13f633e
 MISC metadata.xml 473 BLAKE2B 653c7036ca8c17890778db69bab8294046cff31b4af5ee5148a65181183231cb83e4898eba4e9b3a10565ae6abebdc6b3720d2401c6f397861031d7d19df9521 SHA512 6b3a5f8882234339eddabdc46e3ed4fe34e985558f90e516f31f6e4953719bec084a5e4090f473ef7562ac81427c2a6a122c01020d3626b5aecec50bfd0aac7e
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
new file mode 100644
index 000000000000..decd70b8dc19
--- /dev/null
+++ b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-4.8.5.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson gnome2-utils xdg
+
+DESCRIPTION="Cinnamon's settings daemon"
+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"
+IUSE="+colord cups input_devices_wacom smartcard systemd"
+
+RDEPEND="
+	>=dev-libs/glib-2.40.0:2
+	dev-libs/libgudev:=
+	>=gnome-base/libgnomekbd-3.6
+	>=gnome-extra/cinnamon-desktop-4.8:0=
+	media-libs/fontconfig
+	>=media-libs/lcms-2.2:2
+	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.14.0: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-libs/libxml2:2
+	x11-base/xorg-proto
+"
+BDEPEND="
+	dev-util/glib-utils
+	dev-util/gdbus-codegen
+	>=dev-util/intltool-0.37.1
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	# Miscellaneous meson configuration/compilation fixes
+	# https://github.com/linuxmint/cinnamon-settings-daemon/pull/314
+	"${FILESDIR}/${PN}-4.8.5-build-fixes.patch"
+)
+
+src_configure() {
+	# 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() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-4.8.5-build-fixes.patch b/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-4.8.5-build-fixes.patch
new file mode 100644
index 000000000000..f70d1e544e94
--- /dev/null
+++ b/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-4.8.5-build-fixes.patch
@@ -0,0 +1,140 @@
+From 281bc6b8e0085a91b7e59af45469c4da397646c2 Mon Sep 17 00:00:00 2001
+From: Sparky Bluefang <sparky@bluefang-logic.com>
+Date: Mon, 28 Dec 2020 17:05:21 -0500
+Subject: [PATCH] build: Add missing defines. Fix optional wacom build. Make
+ build options behave consistently.
+
+---
+ meson.build                | 20 ++++++++++++--------
+ meson_options.txt          | 14 ++++++++++----
+ plugins/meson.build        |  2 +-
+ plugins/xrandr/meson.build |  1 +
+ 4 files changed, 24 insertions(+), 13 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 0e11d50..0d6c35a 100644
+--- a/meson.build
++++ b/meson.build
+@@ -9,6 +9,7 @@ pkgname = meson.project_name().to_lower()
+ api_version = '3.0'
+ 
+ cc = meson.get_compiler('c')
++cargs = []
+ 
+ # directories
+ prefix = get_option('prefix')
+@@ -43,7 +44,7 @@ endif
+ cinnamon_desktop_required = '>= 4.8.0'
+ canberra = dependency('libcanberra-gtk3')
+ cinnamon_desktop = dependency('cinnamon-desktop', version: cinnamon_desktop_required)
+-colord = dependency('colord', version: '>= 0.1.27')
++colord = dependency('colord', version: '>= 0.1.27', required: get_option('use_color'))
+ cups = dependency('cups', version: '>= 1.4', required: get_option('use_cups'))
+ cvc = dependency('cvc', version: cinnamon_desktop_required)
+ fontconfig = dependency('fontconfig')
+@@ -56,13 +57,13 @@ gtk = dependency('gtk+-3.0', version: '>= 3.14.0')
+ gudev = dependency('gudev-1.0', required: get_option('use_gudev'))
+ libnotify = dependency('libnotify', version: '>= 0.7.3')
+ kbproto = dependency('kbproto')
+-nss = dependency('nss', version: '>= 3.11.2', required: get_option('enable_smartcard'))
++nss = dependency('nss', version: '>= 3.11.2', required: get_option('use_smartcard'))
+ polkit = dependency('polkit-gobject-1', version: '>= 0.97', required: get_option('use_polkit'))
+ pulse_required = '>= 0.9.16'
+ pulse = dependency('libpulse', version: pulse_required)
+ pulse_glib = dependency('libpulse-mainloop-glib', version: pulse_required)
+ upower_glib = dependency('upower-glib', version: '>= 0.9.11')
+-wacom = dependency('libwacom', version: '>= 0.7', required: false)
++wacom = dependency('libwacom', version: '>= 0.7', required: get_option('use_wacom'))
+ x11 = dependency('x11')
+ xext = dependency('xext')
+ xfixes = dependency('xfixes')
+@@ -80,13 +81,12 @@ librsvg = dependency('librsvg-2.0', version: '>= 2.36.2', required: wacom.found(
+ xorg_wacom = dependency('xorg-wacom', required: wacom.found())
+ 
+ lcms = dependency('lcms2', version: '>= 2.2', required: false)
+-has_new_lcms = lcms.found()
+-if not has_new_lcms
+-    lcms = dependency('lcms2')
++if lcms.found()
++    cargs += '-DHAVE_NEW_LCMS'
++else
++    lcms = dependency('lcms2', required: colord.found())
+ endif
+ 
+-cargs = []
+-
+ using_logind = false
+ if not get_option('use_logind').disabled()
+     logind = dependency('libsystemd-logind', required: false)
+@@ -125,6 +125,10 @@ if gudev.found()
+     cargs += '-DHAVE_GUDEV'
+ endif
+ 
++if wacom.found()
++    cargs += '-DHAVE_WACOM'
++endif
++
+ if not get_option('enable_debug')
+     cargs += [
+           '-Wno-deprecated-declarations',
+diff --git a/meson_options.txt b/meson_options.txt
+index 0a6941b..e3c89f3 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -35,20 +35,26 @@ option(
+     description: 'Whether cups (and therefore the print notifications plugin) support should be enabled'
+ )
+ option(
+-    'enable_smartcard',
++    'use_smartcard',
+     type: 'feature',
+     value: 'enabled',
+     description: 'Set to false to disable smartcard support'
+ )
+ option(
+     'use_color',
+-    type: 'boolean',
+-    value: true,
++    type: 'feature',
++    value: 'enabled',
+     description: 'Whether the color plugin should be enabled'
+ )
++option(
++    'use_wacom',
++    type: 'feature',
++    value: 'auto',
++    description: 'Whether the wacom plugin should be enabled'
++)
+ option(
+     'enable_debug',
+     type: 'boolean',
+     value: false,
+     description: 'Show additional build warnings'
+-)
+\ No newline at end of file
++)
+diff --git a/plugins/meson.build b/plugins/meson.build
+index 0d11a52..069366d 100644
+--- a/plugins/meson.build
++++ b/plugins/meson.build
+@@ -24,7 +24,7 @@ subdir('sound')
+ subdir('xrandr')
+ subdir('xsettings')
+ 
+-if get_option('use_color')
++if colord.found()
+     subdir('color')
+ endif
+ 
+diff --git a/plugins/xrandr/meson.build b/plugins/xrandr/meson.build
+index db2bf73..3296f1a 100644
+--- a/plugins/xrandr/meson.build
++++ b/plugins/xrandr/meson.build
+@@ -11,6 +11,7 @@ xrandr_deps = [
+     csd_dep,
+     libnotify,
+     upower_glib,
++    wacom,
+     xfixes,
+ ]
+