[gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon-settings-daemon/files/, ...
commit: 61dc69e3f082efdfab09d88623449dc5969a7eb9
Author: Sam James gentoo org>
AuthorDate: Sun Mar 17 03:11:59 2024 +
Commit: Sam James gentoo org>
CommitDate: Sun Mar 17 03:11:59 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61dc69e3
gnome-extra/cinnamon-settings-daemon: fix modern C issue
Closes: https://bugs.gentoo.org/919084
Signed-off-by: Sam James gentoo.org>
.../cinnamon-settings-daemon-6.0.0-r1.ebuild | 99 ++
.../files/cinnamon-settings-daemon-6.0.0-c99.patch | 26 ++
2 files changed, 125 insertions(+)
diff --git
a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-6.0.0-r1.ebuild
b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-6.0.0-r1.ebuild
new file mode 100644
index ..dffa7e4efb41
--- /dev/null
+++
b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-6.0.0-r1.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit meson gnome2-utils python-any-r1 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+ LGPL-2+ LGPL-2.1 LGPL-2.1+ MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="+colord cups input_devices_wacom smartcard systemd wayland"
+
+RDEPEND="
+ >=dev-libs/glib-2.40.0:2[dbus]
+ dev-libs/libgudev
+ >=gnome-base/libgnomekbd-3.6:=
+ >=gnome-extra/cinnamon-desktop-6.0:0=
+ media-libs/fontconfig
+ >=media-libs/lcms-2.2:2
+ media-libs/libcanberra[gtk3,pulseaudio]
+ >=media-libs/libpulse-0.9.16[glib]
+ >=sys-auth/polkit-0.97
+ x11-libs/cairo
+ x11-libs/gdk-pixbuf:2
+ >=x11-libs/gtk+-3.14.0:3[wayland=]
+ >=x11-libs/libnotify-0.7.3
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXfixes
+ x11-libs/libXi
+ >=x11-libs/libxklavier-5.0:=
+ >=x11-libs/pango-1.20.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 )
+ smartcard? (
+ dev-libs/nspr
+ >=dev-libs/nss-3.11.2
+ )
+ systemd? ( sys-apps/systemd:0= )
+ !systemd? ( sys-auth/elogind )
+"
+DEPEND="
+ ${RDEPEND}
+ dev-libs/libxml2:2
+ x11-base/xorg-proto
+"
+BDEPEND="
+ ${PYTHON_DEPS}
+ dev-util/glib-utils
+ dev-util/gdbus-codegen
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-6.0.0-c99.patch
+)
+
+src_prepare() {
+ default
+ python_fix_shebang install-scripts
+}
+
+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-6.0.0-c99.patch
b/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-6.0.0-c99.patch
new file mode 100644
index ..36ce9365a554
--- /dev/null
+++
b/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-6.0.0-c99.patch
@@ -0,0 +1,26 @@
+https://bugs.gentoo.org/919084
+https://github.com/linuxmint/cinnamon-settings-daemon/commit/48da3c4763bea93ea3e1d2ba2e2dfdb7f41d8afc
+
+From 48da3c4763bea93ea3e1d2ba2e2dfdb7f41d8afc Mon Sep 17 00:00:00 2001
+From: Leigh Scott
+Date: Mon, 5 Feb 2024 16:07:03 +
+Subject: [PATCH] Fix compile issue (#386)
+
+(Warning becomes an error due to gcc 14 changes)
+--- a/plugins/keyboard/gkbd-configuration.c
b/plugins/keyboard/gkbd-configuration.c
+@@ -340,11 +340,11 @@ gkbd_configuration_get_xkl_engine (GkbdConfiguration
*configuration)
+ const char * const *
+ gkbd_configuration_get_group_names (GkbdConfiguration *configuration)
+ {
+- return configuration->priv->full_group_names;
++ return (const char * const *)configuration->priv->full_group_names;
+ }
+
+ const char * const *
+ gkbd_configuration_get_short_group_names (GkbdConfiguration *configuration)
+ {
+- return
[gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon-settings-daemon/files/, ...
commit: 428009c4f7d1d375ee6997288934c2b4a4922dee
Author: Matthew S. Turnbull bluefang-logic com>
AuthorDate: Tue Dec 28 04:17:43 2021 +
Commit: Sam James gentoo org>
CommitDate: Fri Jan 21 17:13:48 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=428009c4
gnome-extra/cinnamon-settings-daemon: Remove old
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Matthew S. Turnbull bluefang-logic.com>
Signed-off-by: Sam James gentoo.org>
gnome-extra/cinnamon-settings-daemon/Manifest | 1 -
.../cinnamon-settings-daemon-4.8.5.ebuild | 101 ---
...innamon-settings-daemon-4.8.5-build-fixes.patch | 140 -
3 files changed, 242 deletions(-)
diff --git a/gnome-extra/cinnamon-settings-daemon/Manifest
b/gnome-extra/cinnamon-settings-daemon/Manifest
index ac6f9ba8144e..46679822f1f0 100644
--- a/gnome-extra/cinnamon-settings-daemon/Manifest
+++ b/gnome-extra/cinnamon-settings-daemon/Manifest
@@ -1,2 +1 @@
-DIST cinnamon-settings-daemon-4.8.5.tar.gz 662123 BLAKE2B
b3ddd72e55c10c2cacc6dd29145e381395bd2ef68db7082a0770bb3eb647964041ed023d4a8357f2adcf5e8c9f8f713bac837809ed5926cc0434c2dc3e5c90ad
SHA512
4a1d128b3f6faf3e2c13420d3569d4fd8cfaa1798ba5cf83fcb692662b9888d22f9f4bfb6fe18af59d0632583a2730a07e3ab48cca12c357b2d318d205fd7d0a
DIST cinnamon-settings-daemon-5.0.4.tar.gz 663647 BLAKE2B
459ca8b407291e7a84742b75a272a621d05ef1929ec76dd913af477629db862429165cec26a5985c75f81ce8eaddccc6b74cfa882106784bbfb40e015a21bab8
SHA512
861847fb238ae53fdb31c55ab7f8475f3cad9b48a5dd3611e5ea05129e16b44cc48b3ff5d38c2fdcc3669191f952bf194b6bcba80816fb4daee9e91d85b1c781
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
deleted file mode 100644
index f28af6802a1c..
--- a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-4.8.5.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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/
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="
- ${PYTHON_DEPS}
- 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_prepare() {
- default
- python_fix_shebang install-scripts
-}
-
-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
[gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon-settings-daemon/files/, ...
commit: 513af20d19b76dd314b3abf4fd9f6e7c3d2a9cae
Author: Matthew Turnbull bluefang-logic com>
AuthorDate: Wed May 13 02:58:30 2020 +
Commit: Matt Turner gentoo org>
CommitDate: Fri May 29 00:10:45 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=513af20d
gnome-extra/cinnamon-settings-daemon: 4.4.0 version bump
Update cinnamon-settings-daemon to 4.4.0. CUPS dependencies
belong here instead of cinnamon-control-center. Include
patch to fix systemd detection.
Bug: https://bugs.gentoo.org/704532
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Matthew S. Turnbull bluefang-logic.com>
Signed-off-by: Matt Turner gentoo.org>
gnome-extra/cinnamon-settings-daemon/Manifest | 1 +
.../cinnamon-settings-daemon-4.4.0.ebuild | 92 ++
.../cinnamon-settings-daemon-4.4.0-systemd.patch | 36 +
gnome-extra/cinnamon-settings-daemon/metadata.xml | 8 ++
4 files changed, 137 insertions(+)
diff --git a/gnome-extra/cinnamon-settings-daemon/Manifest
b/gnome-extra/cinnamon-settings-daemon/Manifest
index b8caf111fdc..92b72ec7d11 100644
--- a/gnome-extra/cinnamon-settings-daemon/Manifest
+++ b/gnome-extra/cinnamon-settings-daemon/Manifest
@@ -1 +1,2 @@
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
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 000..674a8d9e562
--- /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) \
+
[gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon-settings-daemon/files/, ...
commit: 1fa48e6948b3b979443b740baeb351d2d6b0816f
Author: Kristian Fiskerstrand gentoo org>
AuthorDate: Wed Jul 4 10:48:37 2018 +
Commit: Kristian Fiskerstrand gentoo org>
CommitDate: Tue Jul 31 08:34:32 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1fa48e69
gnome-extra/cinnamon-settings-daemon: New upstream version 3.8.4
Package-Manager: Portage-2.3.40, Repoman-2.3.9
gnome-extra/cinnamon-settings-daemon/Manifest | 1 +
.../cinnamon-settings-daemon-3.8.4.ebuild | 87 ++
...amon-settings-daemon-3.8.0-accountservice.patch | 57 ++
3 files changed, 145 insertions(+)
diff --git a/gnome-extra/cinnamon-settings-daemon/Manifest
b/gnome-extra/cinnamon-settings-daemon/Manifest
index 587df8d1630..509210bf4f7 100644
--- a/gnome-extra/cinnamon-settings-daemon/Manifest
+++ b/gnome-extra/cinnamon-settings-daemon/Manifest
@@ -1 +1,2 @@
DIST cinnamon-settings-daemon-3.6.1.tar.gz 995005 BLAKE2B
c512fe53b707099dca0926893f03056d508bbe22026367c3212a99f22df60d629e02e080fccdeb73151c7aa7e93396b47bede1820059f4a53eace11a56ae5521
SHA512
48a28decff08a191f4ec604386c3bb5c07001d4bc4f7b6d1da379626b41650653fdd14205bbed5321c41fbc281e8638b17e1de30dbba5d299f79cde03216cb33
+DIST cinnamon-settings-daemon-3.8.4.tar.gz 660607 BLAKE2B
1db6e8677c9f9e1fc649d29b3de46d2797f01dbaad3a907329eb6781c6c4ec17706d06045ae230315c7802a5ea176dda73dfcd437fd07e3398ad732e96240a83
SHA512
5bd91e781d47413b50b69b6a8d4cbe9060579452db7408d375f01b05b4070caa684d333ef875a7dda85d1acad3442cddd38e13167fa198e3a5540fef7bedfb75
diff --git
a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.8.4.ebuild
b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.8.4.ebuild
new file mode 100644
index 000..538687301a2
--- /dev/null
+++ b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.8.4.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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="http://cinnamon.linuxmint.com/;
+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
+ >=gnome-base/libgnomekbd-3.6
+ >=gnome-base/librsvg-2.36.2
+ >=gnome-extra/cinnamon-desktop-2.8.0:0=
+ media-libs/fontconfig
+ >=media-libs/lcms-2.2:2
+ media-libs/libcanberra:0=[gtk3]
+ sys-apps/dbus
+ >=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
+ virtual/libgudev:=
+ >=sys-power/upower-0.9.11
+
+ colord? ( >=x11-misc/colord-0.1.27:= )
+ cups? ( >=net-print/cups-1.4[dbus] )
+ input_devices_wacom? (
+ >=dev-libs/libwacom-0.7
+ 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
+ >=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
+
+ # 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-3.8.0-accountservice.patch
b/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-3.8.0-accountservice.patch
new file mode 100644
index 000..c12f2730cea
--- /dev/null
+++
b/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-3.8.0-accountservice.patch
@@ -0,0 +1,57 @@
+From 15b1c1488f28e69cee86ff25bf0c95ebf5245add Mon Sep 17
[gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon-settings-daemon/files/, ...
commit: 7eb357e5a42ea85e176d10f6a2087b26b09153ed
Author: Pacho Ramos gentoo org>
AuthorDate: Sat Jun 25 15:49:29 2016 +
Commit: Pacho Ramos gentoo org>
CommitDate: Sat Jun 25 16:26:34 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7eb357e5
gnome-extra/cinnamon-settings-daemon: Version bump
Package-Manager: portage-2.3.0_rc1
gnome-extra/cinnamon-settings-daemon/Manifest | 1 +
.../cinnamon-settings-daemon-3.0.1.ebuild | 89 ++
.../cinnamon-settings-daemon-3.0.1-optional.patch | 84
3 files changed, 174 insertions(+)
diff --git a/gnome-extra/cinnamon-settings-daemon/Manifest
b/gnome-extra/cinnamon-settings-daemon/Manifest
index c2e5758..5139189 100644
--- a/gnome-extra/cinnamon-settings-daemon/Manifest
+++ b/gnome-extra/cinnamon-settings-daemon/Manifest
@@ -1,2 +1,3 @@
DIST cinnamon-settings-daemon-2.8.3.tar.gz 2935149 SHA256
bc04333674ee10886b6c2644bd74c21ce6d3f6f1e005ebce63693cb14bb1a298 SHA512
a66ab0943f4a370fb203ba73dfa9f938ab2fc418c7876b7a048fc438ed8eaef3f5f7789ce86c0c2039ed61473c1b3fb9c60205571140291448854c03cba36f76
WHIRLPOOL
93ecc021ffa76a493d65fcd001253da6ebbd2c8f92be716f4d0de0df53867fb24177a6f31027611586e965d1e378a8b53662dd3c5a73df026d13d3a7fd5ae080
DIST cinnamon-settings-daemon-2.8.4.tar.gz 2935478 SHA256
2f7e8764a842d9b4f21c1e6d5321e4101720f1600462b5452d14a061b608c584 SHA512
fab449efdfe4f12d17d61299b9c264d0bd70d88811406da68eab48943dbcd75ef3a87551eba653660efc4006c45f7eaa59d9ac3616a6da6808d35e59dd0a6d7f
WHIRLPOOL
bcdd93d53352d649f81a43730f4116508ad24379ba5e5c46a1dc9b867a653b9172b50b78b06450159f4e785bab8e2a604f172d2553dd949d693c358695ba4f17
+DIST cinnamon-settings-daemon-3.0.1.tar.gz 2912459 SHA256
0abe839e04a36a052bb486f90e84c25ae6ccc92b74223813d9666eaac257677b SHA512
848f1bc38e84edf9a8af48e55b7581881fbc9920dce9a4fc38627456dea7cbfe330bebba4bb46d1c231dd85bd3445d365b5e415485ac202e72335fe337a800e8
WHIRLPOOL
91b5b0455c2dcde8868eb8e1adf52229e3dd94fb4c4842d537b89e1c72cd8f8f54af854765c62eb382015b8f3299400f21a9034974440ce9b7d305be4ffb82fb
diff --git
a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.0.1.ebuild
b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.0.1.ebuild
new file mode 100644
index 000..f87a78d
--- /dev/null
+++ b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.0.1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+
+inherit autotools eutils gnome2 virtualx
+
+DESCRIPTION="Cinnamon's settings daemon"
+HOMEPAGE="http://cinnamon.linuxmint.com/;
+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"
+
+# udev is non-optional since lots of plugins, not just gudev, pull it in
+RDEPEND="
+ >=dev-libs/glib-2.38:2
+ >=gnome-base/libgnomekbd-3.6
+ >=gnome-base/librsvg-2.36.2
+ >=gnome-extra/cinnamon-desktop-2.8.0:0=
+ media-libs/fontconfig
+ >=media-libs/lcms-2.2:2
+ media-libs/libcanberra:0=[gtk3]
+ sys-apps/dbus
+ >=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
+ virtual/libgudev:=
+
+ colord? ( >=x11-misc/colord-0.1.27:= )
+ cups? ( >=net-print/cups-1.4[dbus] )
+ input_devices_wacom? (
+ >=dev-libs/libwacom-0.7
+ x11-drivers/xf86-input-wacom
+ x11-libs/libXtst )
+ smartcard? ( >=dev-libs/nss-3.11.2 )
+ systemd? (
+ sys-apps/systemd:0=
+ >=sys-power/upower-0.9.11:= )
+ !systemd? (
+ sys-auth/consolekit:0=
+ || ( >=sys-power/upower-0.9.11 sys-power/upower-pm-utils ) )
+"
+DEPEND="${RDEPEND}
+ dev-libs/libxml2:2
+ >=dev-util/intltool-0.37.1
+ x11-proto/kbproto
+ virtual/pkgconfig
+"
+
+src_prepare() {
+ # make colord and wacom optional
+ eapply "${FILESDIR}"/${PN}-3.0.1-optional.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-man \
+ --enable-polkit \
+ $(use_enable colord color) \
+ $(use_enable cups) \
+ $(use_enable smartcard smartcard-support) \
+ $(use_enable systemd logind) \
+
