[gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon-settings-daemon/files/, ...

[Pacho Ramos]

commit:     7eb357e5a42ea85e176d10f6a2087b26b09153ed
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 25 15:49:29 2016 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sat Jun 25 16:26:34 2016 +0000
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 0000000..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) \
+		$(use_enable input_devices_wacom wacom)
+}
+
+src_test() {
+	virtx emake check
+}

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
new file mode 100644
index 0000000..c12d763
--- /dev/null
+++ b/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-3.0.1-optional.patch
@@ -0,0 +1,84 @@
+--- 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