Version bump

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

3 files changed, 120 insertions, 19 deletions

diff --git a/gnome-extra/cinnamon-settings-daemon/ChangeLog b/gnome-extra/cinnamon-settings-daemon/ChangeLog
index 2981542dc908..c43148735fd9 100644
--- a/gnome-extra/cinnamon-settings-daemon/ChangeLog
+++ b/gnome-extra/cinnamon-settings-daemon/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-extra/cinnamon-settings-daemon
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-settings-daemon/ChangeLog,v 1.16 2015/06/14 04:02:35 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-settings-daemon/ChangeLog,v 1.17 2015/07/04 19:26:55 pacho Exp $
+
+*cinnamon-settings-daemon-2.6.3 (04 Jul 2015)
+
+  04 Jul 2015; Pacho Ramos <pacho@gentoo.org>
+  +cinnamon-settings-daemon-2.6.3.ebuild:
+  Version bump
 
   14 Jun 2015; Alexandre Rostovtsev <tetromino@gentoo.org>
   cinnamon-settings-daemon-2.6.2.ebuild:
diff --git a/gnome-extra/cinnamon-settings-daemon/Manifest b/gnome-extra/cinnamon-settings-daemon/Manifest
index acb3c4f4a969..f4e500bb775e 100644
--- a/gnome-extra/cinnamon-settings-daemon/Manifest
+++ b/gnome-extra/cinnamon-settings-daemon/Manifest
@@ -1,30 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX cinnamon-settings-daemon-2.4.3-optional.patch 3056 SHA256 b0043cb4745cf19c64fc38a9026c9fc4722e5cc04789eb43c9e1c18715f18c9e SHA512 0a167d19e3e698ef23973fe2a05fe99fb00cdbb552347563307b4252134ed0b32a05df859b42233cf327d989df437b78e712e4d8c9022f3d9e3cef25cf0421e6 WHIRLPOOL bc572458dbc647441c9ab45ed5495ceca54ef1c977055437b9fd681c2636fa318791c15064269f962f958726ae381e8f0d90a833d1b0c47403aedda2aff7d355
 AUX cinnamon-settings-daemon-2.6.2-optional.patch 3775 SHA256 ab913f4b50ea03d7a9a458c79bfffc7539606758d6e8dddd02b4b3a7733e96f5 SHA512 f572ac63e951e5b47ec06af26da78c21812f1b44ae11b531be6878c9b80f968790c1af3abb8445ba0ddc379001143dd3ce4cfa19e0b87339854e594ec714bd8c WHIRLPOOL f474cbb0a4bf7e1dcaf41b287bdaa51e46f0f467cd8719498250d563110d164d02dbf424a7d83dfc48ab6f67cac6b1ae410998eded2e042abe23ed7ec10d3d21
 DIST cinnamon-settings-daemon-2.4.3.tar.gz 2998895 SHA256 1d3c47aad65f9c5064686352012cf1783e51440fa45f4ee030bb33ac66304fd2 SHA512 a70b04fbbddf735582043554c809f6dc098b58938b7245de8b1398ac4a38e9483f43e8b08ec7810d81cc3afabbad74045a1abfa6d2ed4e8b672f5df971e7c916 WHIRLPOOL 9416bd0af5f1bc27358768d46c6d51c25f49436825ac201b01c6986b80aebb78a91baaa79e72bc0577f818330bf19046e5f3dcdafb245779ddc47f3714d47eea
 DIST cinnamon-settings-daemon-2.6.2.tar.gz 2990964 SHA256 a97b85a2f9aafdc9c7c7facc97e422d7bc9531a920ac2e685fd82c56c01d8dec SHA512 72fc93ff27fc8b565349069a4713ac13f13dd600da64e9f35f35c9b2eb625afbc71bd5d1586653ad4f08cd3b65dbad9110aa21be24a6194eae40f367646608c9 WHIRLPOOL ed1d0a89465333c476e60cf9f49ef8e98e4dc2fcb65acc773fc662f06054f37d88407d04276b9d419ed017b5ed6af52731d97de4744a19b4c13af18df20b9fba
+DIST cinnamon-settings-daemon-2.6.3.tar.gz 2992102 SHA256 b71a515f9eed5efd35ef134f291a9dd9674d81026b23c85377493b53ec1cf0ae SHA512 ff6ec6be7a134414a525bd5dce6d90570800d0dbfc5f1641b02fbe17389bcf32d47832f5fcd736cdff8dfa09f129f998acd99d9358b1edf5315edb91c8b553ba WHIRLPOOL 9d2fb909fca23f7db2124e56e285e6c7623a9e7d710309f92894a2ab19b6a5a7e92b4e5c947e0cc74513eec30f7fa7bc7464997a1fdc3ff27ad19040579efdb0
 EBUILD cinnamon-settings-daemon-2.4.3.ebuild 2883 SHA256 cabbb1288fa0f46bc3ab371e7a17d8ae1fbf9e6ecceceb06e783ac163a81652d SHA512 6b16b845731de0c5f0a1ce4c39a3575455eaf8bf804f8b9dbb8b1d4976b074e44ad15851b21aada0381ea6bbcf2e161081920bdf902ffccaf855d8946d237b76 WHIRLPOOL 3cf4620989f7e7e171ce4c0abf73a161d20c06239973d3643e35aaf28f93bdf26884e67a3d7bd606c6a312d4d16cfaff116f2c23e4e52f1c18944679e9b98c73
 EBUILD cinnamon-settings-daemon-2.6.2.ebuild 2897 SHA256 21d0212137631ae3b8370af4080a0dba9442ce3707c2ecfe6823a5caf99c69da SHA512 887b9f928d349ed17f9f805adc7eb11894b42fb39249bfa02d69875ab002d1185b00384f137936bf18e292c973fedeb6545a44dbec829f100e42eaac45c839b2 WHIRLPOOL 3b21ce33a961ec07dd0c29759af69c92c5270ff84169ee3f05f42915fb95e25ae670879927810b5138ce6cd35b97cf947676b684d5c78eadc8ed8ba957e42739
-MISC ChangeLog 3233 SHA256 52a92c598d50895e0d93928007b45a2b7dcb1616d59b8d75ad2104ad51e8cf34 SHA512 8ebfef76640d2fcb2fb173ec92baf7201bfcbe0000c706de8a260dd6740854888a8e2da727d66cb71ddf829df73df996ee566149e6ae5d6d5b4865f98f38d3ed WHIRLPOOL 33ea0bc62c1709f6a85c89365219ad829850575be4ee296f53c90e010294734f7e83c98ccb0dbfb19650db544d41de4c6fc704826a0a1581267f6b2ace3b23ed
+EBUILD cinnamon-settings-daemon-2.6.3.ebuild 2893 SHA256 f7754dc5b9e931e819aba63a109e1c48a78730ca97926fa4f7c5069ad90e8b7d SHA512 2ddfbd4252fd6908be227fa1370cc68ea136f880d043cc59df7135529c8e0cc92b25b3ca8cf90e91d171aba2ce08cb6b7f1ef3c95394fa32a00029bdcf5dafd8 WHIRLPOOL c8023e8b1af62bb51bea08004510884184994b9bee0d747b79619a690c2d9948c86a51d106b9f0e3e391302fb69d74a5b9064eca6687d44f1048aabe320d1c46
+MISC ChangeLog 3380 SHA256 8d403b058f09570f19021ec289e0cfe163cc23e54f2c84d693525c65de8ee7f6 SHA512 8a8191ec891d310c28c1d025b8ec5e7f4d0a1156c34238bba6813939b0cd0bd42f4b1157a1bb2e85d07c16f1b2f7b3a8ad6ffbae11685638dce8698ea3e66c40 WHIRLPOOL ba78c2d4a6e4fd75344bcb61a89db3d1f08d6d34727934bbb7eec759a85fd36c5df8ae7aa17e5300814e66746235114fbb95d5699aa92994c43a55ecb53fe018
 MISC metadata.xml 360 SHA256 65e29ea447185c2f0d3434197ea7cdf34a45f40531022498eeb350d23a30611c SHA512 e3da90c70d75e2c350b986cb06fea5034fc9a36e2e55cf2754e6767c849b0d95402b8daf761c5c76e321a883dc0148a929fd63b49c731642ce1047fcd20bac5d WHIRLPOOL 6f5d8b9775fbd53eb63b25c2e0138b5b0359ab949da294214225012c4b2d6dea020745f1c078aefa5d058e49c2a34a03eb1290282ac71597a8542a234531f8f5
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCgBmBQJVfs0KXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiH5sQAJFu74Q1QkzaOE9Bd0qFKmqO
-J1KQu9Uhc7i9VjC0Tzu5dOk58wamiSiijjHzs9fBF6xxJctIP3TgmnZs8WUj8YfJ
-5+8ADsirH3WwiQPRculwJjRPBEob0P4eKaeX22a0mZpAg55JhNFRANlkOhDjO/Ax
-RxbwiYyKw02PkBIhczYPFHUmkI2AMjqFQIf+UeR5+d2I/J4vgACIVagZOIJG+9n0
-V5e+W8LBKidDCiDIwl9uiXOfwkCBqVZ/6M9kZekfzi68JBFcopQ17sZtnqSJLPgV
-e5kWCXujEcP6lEM5jAroQPR/5MAhmjfxy3e3IlKhOCuLL1LERLHiMU3xD5xFOZC7
-W5Mv0An4d9ek9qWbFS7t9S2vy6XI1EywCJ20+ujG54v80KEuqZTsqP33576bh0Lr
-6i2cCxCarYq4ky0i7Z+phJVMm7n7js9Kawuohj6Z6NFyMnkneWqdYC0hMhJ2M45H
-2Bxv8QCg5nELIjuycc9xjlwuevy5WeUY1pqujMwLrb/ZSB3/uSa8LgpRj3/EEMax
-kzLBEtFiaG2+CoUqrIj/dBarTTkbzdbTZxqR9TugOTqAE5r7WR8SYX2zktE1zrLL
-GFl6qAJki8CfVTxIFG6fkqg9G5ZbM96Xxdl+VvIwjsVE1C7myDaAqoA0GPOdbAFy
-VxqVtXK6glAfdQjTlgYL
-=k0Mx
+iEYEAREIAAYFAlWYM4AACgkQCaWpQKGI+9TykwCeKMzERi6Ac+Gip2SWtmIbW+uk
+WNUAnicwFOkZ8qkUy0cHyarMJERmrTDD
+=T1Po
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.6.3.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.6.3.ebuild
new file mode 100644
index 000000000000..07dbe3f658a8
--- /dev/null
+++ b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.6.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.6.3.ebuild,v 1.1 2015/07/04 19:26:55 pacho 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-3.6
+	>=gnome-base/librsvg-2.36.2
+	>=gnome-extra/cinnamon-desktop-2.6.3: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.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= )
+	!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.6.2-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 logind) \
+		$(use_enable input_devices_wacom wacom)
+}
+
+src_test() {
+	unset DISPLAY
+	Xemake check
+}