Version bump for Cinnamon 2.4, bug #529816.

(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key C6085806)

3 files changed, 196 insertions, 2 deletions

diff --git a/gnome-extra/cinnamon-settings-daemon/ChangeLog b/gnome-extra/cinnamon-settings-daemon/ChangeLog
index f5ae82d4d418..72753c9db4eb 100644
--- a/gnome-extra/cinnamon-settings-daemon/ChangeLog
+++ b/gnome-extra/cinnamon-settings-daemon/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-extra/cinnamon-settings-daemon
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-settings-daemon/ChangeLog,v 1.10 2014/09/26 20:36:16 pacho Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-settings-daemon/ChangeLog,v 1.11 2015/01/11 17:28:32 eva Exp $
+
+*cinnamon-settings-daemon-2.4.3 (11 Jan 2015)
+
+  11 Jan 2015; Gilles Dartiguelongue <eva@gentoo.org>
+  +cinnamon-settings-daemon-2.4.3.ebuild,
+  +files/cinnamon-settings-daemon-2.4.3-optional.patch:
+  Version bump for Cinnamon 2.4, bug #529816.
 
   26 Sep 2014; Pacho Ramos <pacho@gentoo.org>
   cinnamon-settings-daemon-2.2.4.ebuild:
diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.4.3.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.4.3.ebuild
new file mode 100644
index 000000000000..0141a65f71b7
--- /dev/null
+++ b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.4.3.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.4.3.ebuild,v 1.1 2015/01/11 17:28:32 eva Exp $
+
+EAPI="5"
+GCONF_DEBUG="yes"
+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-2.91.1
+	>=gnome-base/librsvg-2.36.2
+	>=gnome-extra/cinnamon-desktop-1.0:0=
+	media-libs/fontconfig
+	>=media-libs/lcms-2.2:2
+	media-libs/libcanberra:0=[gtk3]
+	>=media-sound/pulseaudio-0.9.16:0=
+	sys-apps/dbus
+	>=sys-auth/polkit-0.97
+	|| ( >=sys-power/upower-0.9.11:= sys-power/upower-pm-utils )
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.7.8: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.9:= )
+	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/consolekit:0= )
+"
+DEPEND="${RDEPEND}
+	dev-libs/libxml2:2
+	>=dev-util/intltool-0.37.1
+	x11-proto/kbproto
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	# make colord and wacom optional
+	epatch "${FILESDIR}"/${PN}-2.4.3-optional.patch
+
+	# Disable broken test
+	sed -e '/g_test_add_func ("\/color\/edid/d' \
+		-i plugins/color/gcm-self-test.c || die
+
+	# Fix intltool unittest
+	cat >>"${S}"/po/POTFILES.in <<EOF
+data/org.cinnamon.settings-daemon.peripherals.wacom.gschema.xml.in.in
+data/org.cinnamon.settings-daemon.plugins.background.gschema.xml.in
+data/org.cinnamon.settings-daemon.plugins.background.gschema.xml.in.in
+plugins/datetime/org.cinnamon.settingsdaemon.datetimemechanism.policy.in
+plugins/keyboard/csd-keyboard-xkb.c
+plugins/wacom/csd-wacom-device.c
+plugins/wacom/csd-wacom-osd-window.c
+plugins/wacom/org.cinnamon.settings-daemon.plugins.wacom.policy.in.in
+EOF
+	
+	epatch_user
+
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	DOCS="AUTHORS ChangeLog MAINTAINERS README"
+
+	# 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) \
+		$(use_enable input_devices_wacom wacom)
+}
+
+src_test() {
+	unset DISPLAY
+	Xemake check
+}
diff --git a/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-2.4.3-optional.patch b/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-2.4.3-optional.patch
new file mode 100644
index 000000000000..894642781e67
--- /dev/null
+++ b/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-2.4.3-optional.patch
@@ -0,0 +1,82 @@
+From 0bfad0d65540acc6598c694904cdb9f7032c952d Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Mon, 5 May 2014 21:50:25 -0400
+Subject: [PATCH] Make colord and wacom support optional and non-automagic
+
+---
+ configure.ac        | 20 +++++++++++++++++---
+ plugins/Makefile.am |  7 ++++++-
+ 2 files changed, 23 insertions(+), 4 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 6a17530..e5a752c 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -260,15 +260,28 @@ fi
+ dnl ---------------------------------------------------------------------------
+ dnl - color
+ dnl ---------------------------------------------------------------------------
++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.9 cinnamon-desktop >= $CINNAMON_DESKTOP_REQUIRED_VERSION libcanberra-gtk3])
++  build_color=true
++fi
+ 
+-PKG_CHECK_MODULES(COLOR, [colord >= 0.1.9 cinnamon-desktop >= $CINNAMON_DESKTOP_REQUIRED_VERSION libcanberra-gtk3])
++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")
+ 
+@@ -604,6 +617,7 @@ echo "
+         LCMS DICT support:        ${have_new_lcms}
+         Libnotify support:        ${have_libnotify}
+ 
++        Colord support:           ${build_color}
+         Wacom support:            ${build_wacom}
+ 
+         Smartcard support:        ${have_smartcard_support}
+diff --git a/plugins/Makefile.am b/plugins/Makefile.am
+index b9cb3a6..f37eec0 100644
+--- a/plugins/Makefile.am
++++ b/plugins/Makefile.am
+@@ -6,7 +6,6 @@ enabled_plugins =	\
+ 	automount	\
+ 	background  \
+ 	clipboard	\
+-	color		\
+ 	cursor		\
+ 	dummy		\
+     datetime    \
+@@ -23,6 +22,12 @@ enabled_plugins =	\
+ 
+ disabled_plugins = $(NULL)
+ 
++if BUILD_COLOR
++enabled_plugins += color
++else
++disabled_plugins += color
++endif
++
+ if BUILD_WACOM
+ enabled_plugins += wacom
+ else
+-- 
+2.2.1
+