Version bump for Gnome 3.16. Clean up old revision.

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

5 files changed, 167 insertions, 11 deletions

diff --git a/gnome-base/gnome-settings-daemon/ChangeLog b/gnome-base/gnome-settings-daemon/ChangeLog
index b2a95fd98427..a0e7affcc362 100644
--- a/gnome-base/gnome-settings-daemon/ChangeLog
+++ b/gnome-base/gnome-settings-daemon/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for gnome-base/gnome-settings-daemon
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/ChangeLog,v 1.156 2015/05/01 22:00:01 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/ChangeLog,v 1.157 2015/06/09 14:21:45 eva Exp $
+
+*gnome-settings-daemon-3.16.2-r1 (09 Jun 2015)
+
+  09 Jun 2015; Gilles Dartiguelongue <eva@gentoo.org>
+  -gnome-settings-daemon-3.14.3.ebuild,
+  +gnome-settings-daemon-3.16.2-r1.ebuild,
+  +files/gnome-settings-daemon-3.16.0-optional.patch,
+  +files/gnome-settings-daemon-3.16.2-settings_set_display.patch:
+  Version bump for Gnome 3.16. Clean up old revision.
 
 *gnome-settings-daemon-3.14.4 (01 May 2015)
 
diff --git a/gnome-base/gnome-settings-daemon/Manifest b/gnome-base/gnome-settings-daemon/Manifest
index df0f04b9764d..3f7dbc47da96 100644
--- a/gnome-base/gnome-settings-daemon/Manifest
+++ b/gnome-base/gnome-settings-daemon/Manifest
@@ -3,19 +3,21 @@ Hash: SHA256
 
 AUX gnome-settings-daemon-3.12.0-optional.patch 3231 SHA256 02cba586c02849e7bb6662fed09e7ee43c375440088baba943ef676fd358dc9c SHA512 237212486b458144f5d795887fffbf29b0b8b2560eb4bb78b7dccf53dc1acd90f097bd47080d07d0b62a70c6df89b50b8891ebba2007253b2f5c182025297bf9 WHIRLPOOL d03bbc35493a63d226e8c703fac42052f45be3fd98c44f995b02c96b945dc13016b73b981d7bc13720e7cd9b06ca2736897c5f0cb09db5890faaf7baa04d48fe
 AUX gnome-settings-daemon-3.14.0-optional.patch 3621 SHA256 f32703d16e3a4a3165ee1fc628766a64c469988a222f73e98a715f72b91c19f6 SHA512 b02efcb5030f9ea3694c7c320bf4efb73bedd7a55386f7a3a610e6f86fb20c4fb05162a6c9926ee4358c77ae6735d8809684be219d1ebb2844cf5a3a17213ba6 WHIRLPOOL 378bc84a3514f1eee18b4c249a05f8804340c9af1cdf1a9066c3c4cd9a22a25bb05393b3ee8d9e1c04fb745223e5a307e6578ef5cfe05c2fb1186820b69ffd4e
+AUX gnome-settings-daemon-3.16.0-optional.patch 3615 SHA256 a12ee0acff17d3c02da9a4fb01abffda88865af7b749d9cdc89c13b89dcafb6a SHA512 9701016c88fef09ec7ffbae75d1085f1f9d8fe9573cda9f8b5154a051de18ab6c6d21880536a569f6bea67a28202ab4bd96cd3e0fbc84d36f6a0ebdaecede610 WHIRLPOOL a0afa10ee62c6384b75639b60205e2e47b2df02f53aa6fdd605996c825e5392603135dd57f8178cbafd9da8e3b196a1054c6ded4213b932369931b8381c2acd6
+AUX gnome-settings-daemon-3.16.2-settings_set_display.patch 1413 SHA256 820af52ccf5a5bcedba50ecb949b5b03da36c6eb5c6d73cea44184d743b74d33 SHA512 e7c81b8e773bcf93d5224edcf4dfdb92a76c1dc8489c8270efd80b599c4e01c5be09ae395869b36f8c4570c5b3cc9c33b320f1670ec27c0c65f4aa3d9881719f WHIRLPOOL 936614935e08f02fa4ea71a7f4763a6381a53917bd35f02590b17319c0f8769d13b21fd53e289d8a3aef7668fa8f9d6915344eab27d3f69f00db80ed9257daa3
 AUX gnome-settings-daemon-3.7.90-short-touchpad-timeout.patch 960 SHA256 d69495e4fca23d7faa7c9fefb0ec42d0d7d0769d3830f8cde08d5caea015138b SHA512 c431973f6d5b461a3d8bc1702522ac20d3c54252341e4ba5f712dd524a322e28d1a6a5f89920e9be9438217a6c418c5b254112be68f47d2ceb6b62790497e16f WHIRLPOOL dae508b8717d31bd6fa525d080c8f5d1e065b8d8c43102263760101cb48a7554e86887a5956efb3695023f412806fa67176f00d4de6ee614c630c56b3c46bfc6
 DIST gnome-settings-daemon-3.14.2.tar.xz 1612184 SHA256 066bc8ed751c5f6b5a9590911a0fb2b51b0c3436ae1caccfa42e0791c34fedee SHA512 3cd125ed89d47b03439f473df861d41696f6281c9df84218f3fe29d86570fbcd13dd2bedb3f63b354e06043d7d8fda0d1304e03a6ca39b9bcbd369a908d88ba2 WHIRLPOOL 157195486a9ed8db18fe851ea8a567d2c53beeaf3cfc6d21f5e25a876f2e5b6847ccb6e848bae6accdd3861c96b16a0bfd5642f8e0fce3f8c3d4923599d49260
-DIST gnome-settings-daemon-3.14.3.tar.xz 1607624 SHA256 3c015a395d4815a22e5b6061272d4dd6ac93f499086bf12ae288946647447037 SHA512 31fffbab33e930b1a312b3eadd5229532e7e3c906eca6db5a5a5bcc561241dfd7965a1be27fc5676ff3e6d503a25b2bc324608793ab988ce1754f0274da0e1b2 WHIRLPOOL 6ebb619dfa7f061dfccf7f93d52736170a976fea22b54964fa9a4c4b0656e5676c50d35bf4cf0ef0ab25f8da13387df587798123832dfb043ff9ab1f08099f2b
 DIST gnome-settings-daemon-3.14.4.tar.xz 1650276 SHA256 ce4453f83a19328e4f031251430325cb6ae832b83fa9fce80a8cde1d4bb0a2a5 SHA512 c6c62f7e13f93fd3dcff7990571289e10c9ef341ebb9d6deab67adf705a32a13142b7e8aebccd4a71d39f191a472d427fdea5acebc5fcf6f6106c641af320a32 WHIRLPOOL 145e694c74364f6fec6543976cf1e0abb6049f8a13c8f0c8b95a481d849a94255f68ade1a4926f0207c19cdbc8927f55edbcae68b01e7ef95046c3786cb07cbb
+DIST gnome-settings-daemon-3.16.2.tar.xz 1602508 SHA256 d8d536584ebb8fb1403050eb65e7ee3328eba14b123542369ff1917e727fa69a SHA512 04f62429b6f3edf6d7c11b0fbe8b5b74a3be3d6309ec7a9019dc77d2f8557ad26242a210bcfb36b393b99d93c33590c595c6d7dca9c1272f04bdf5cfc7144076 WHIRLPOOL 95f69752b3a9ad7d22489123555cd84dffb6c0ac4872dd5febbfb444013eb2417a0f50f53b311f640cc3d4ac8b662c0b2a102fbe3e32de0614161ed9cf646579
 EBUILD gnome-settings-daemon-3.14.2.ebuild 4525 SHA256 9f6478b0127570cad19bd2a8b9dce8ff5e2923a02f4e50b9285bee0c3280dbe8 SHA512 c8155622b5bf21fe95db045a4755160373901017085be0f4d99786fc0cb0944f432afbf85a8732ca7037f7d7754876997336454ce6f6475548976ebc73406246 WHIRLPOOL fc3b0ee5e035e3225a73547ce2830614145cf51c156476b83cf5d5c86945432249397c86bbe8abab077e9436776af428f6d9d41969eeacfe0c4d4bb0abfd5112
-EBUILD gnome-settings-daemon-3.14.3.ebuild 4533 SHA256 36d46ce9982498ca0887e39929accb7f2a960573768355d5dc30d59c506b8eea SHA512 3beaa4c51737b8b6f25bb1e19b303a56f11e30faf76fa078db0eedca7a1626cd349e28d1c454d5849b8c6e31e5265ce011f1595661f0531668366535834ee3fa WHIRLPOOL bcae2211c6b5856b1443dc4d79fe47a5ced8c4928ded4057b8df317b92f2a3fe66c620f016717ba9de53d66ed2811fcf44ac7353ab500b3e8aea1147a067dbe6
 EBUILD gnome-settings-daemon-3.14.4.ebuild 4531 SHA256 557de388dcdb0e10ae4447acb8ad1f2b19b4daaa8cc1bc6ae04f4433cb0c7ab1 SHA512 a6adc05577600b8968e5460217983090f4f2ec7d2e6738862062f525c75d4a385575c66315f0bdabacc5c03e5e36102148c81bd333cb7fb62140397e71c7d5d8 WHIRLPOOL cd2ba314ab6542974a3c11f561a1da8e139eeb4267d5c78f380f2a93899434be8423402763bbe4513b0821f6dec9784bf823993010a966a78b6303b19a312d49
-MISC ChangeLog 31943 SHA256 8bfd23e3891ca6fc06cdc8af1a6253a4a4ef4ea661017f28ddc2ce27f7b00f44 SHA512 212de0931afb56f79571adf97e64d851c0b1681de8579da62dbe800f695c78a80d51cf282a6d782b5fd78204f28d95a3b5dcea62941d6762ecf81f56c5141dfb WHIRLPOOL 7ddd1bbc253497a6941b53e9dfdbc303dd4de3ba905bf6f5f2c6ad18d1d5ebcc721d92613ae96632ea0460ffa5835a5eb39d679920872fac63b381716d02db9c
+EBUILD gnome-settings-daemon-3.16.2-r1.ebuild 4663 SHA256 985dba146ca520f935ff63a64c6ce94143105b8b44b70d35636733cdc279904e SHA512 bb5bd66c27d4e346aa486bc0ffa45d88258442413ea37b543ebc2456ec00e886dd5fee17c34f45752a5ad3e00a1b5f1b6cfc054b2e9987d55997be0c2823b493 WHIRLPOOL 205e838e44e95b2dcea596d35f8d44b1163e646dda965068e3c4e3db735507a7b7bf56d340c0585a794ab2c5b0237c74175cb0a015b3a3a8ba8b29674c0c43ad
+MISC ChangeLog 32303 SHA256 1385add67a6382aabb1d7315f63a3948bf8bc9a186de1c6ddeedc6b1359eebb9 SHA512 55b9c73c97169b055ee3af22ad63ef34a3d957b73893f22a204f43aad956cbe46c7ffca99c939b4029f952ecef4f41fbb52ce632184e24fbbf20363edb918e62 WHIRLPOOL 5dac60ab39723d9919609977091c808c9a81afa692514709ff07151461104dbc226d35b47c8c17f6268586673056204b5f1243dbf0e0a3d5c7082639e9f2675e
 MISC metadata.xml 614 SHA256 ff799c6810b3398bf3d2678f89daccc3b2299d7b837eaea672489c4e6f992031 SHA512 6b4418aceaa83c008317cbc33e3dc1b53ae9d373a4a13af4ace91b302fedae5c34b2e80e68040a7db63d78cb2a4beb08590f8228023fc1fbfb17d8ea21be554e WHIRLPOOL 77e484c5f8dad10907ce52d875d2dc9060babc037e3624b4706af9f88c51d130f550c0d4f61f0c066df2e3cc27fb7f884a3a14cf10a4bebaeef6ba7e8c7f7ab1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlVD92IACgkQ1fmVwcYIWAZ/6QCfYgrRyOJk8ismxmdNDvidl0ui
-6hsAn0/GAPTt34K/rsRL2/Pi8pkIiPFR
-=9HOo
+iEYEAREIAAYFAlV29noACgkQ1fmVwcYIWAa5XACfcEO6lD0LZps/q9h/KcEueOyr
+QTUAoOqyoAL6PmeXHzpTjP9zBgVY/Or2
+=5yDx
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.16.0-optional.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.16.0-optional.patch
new file mode 100644
index 000000000000..46d97392b9e8
--- /dev/null
+++ b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.16.0-optional.patch
@@ -0,0 +1,95 @@
+From 8b526c757f0e977eeda9285762e137deba0a31f4 Mon Sep 17 00:00:00 2001
+From: Ole Reifschneider <mail@ole-reifschneider.de>
+Date: Sat, 11 Apr 2015 23:10:21 +0200
+Subject: [PATCH] Make colord and wacom support optional
+
+---
+ configure.ac        | 35 +++++++++++++++++++++++++++++------
+ plugins/Makefile.am |  7 ++++++-
+ 2 files changed, 35 insertions(+), 7 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 50a6bb1..a42ec20 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -236,7 +236,20 @@ dnl ---------------------------------------------------------------------------
+ dnl - color
+ dnl ---------------------------------------------------------------------------
+ 
+-PKG_CHECK_MODULES(COLOR, [colord >= 1.0.2 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION libcanberra-gtk3])
++AC_ARG_ENABLE([color],
++  AS_HELP_STRING([--disable-color],
++                 [turn off color plugin]),
++       [with_color=$enableval],
++       [with_color=yes]) dnl Default value
++
++if test x$with_color = xyes; then
++       PKG_CHECK_MODULES(COLOR, [colord >= 1.0.2 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION libcanberra-gtk3])
++       AC_DEFINE(HAVE_COLOR, 1, [Define if color plugin is enabled])
++fi
++AM_CONDITIONAL(WITH_COLOR, test "x$with_color" = "xyes")
++
++AC_SUBST(COLOR_CFLAGS)
++AC_SUBST(COLOR_LIBS)
+ 
+ dnl ---------------------------------------------------------------------------
+ dnl - datetime
+@@ -267,15 +280,25 @@ case $host_os in
+     if test "$host_cpu" = s390 -o "$host_cpu" = s390x; then
+       have_wacom=no
+     else
++      have_wacom=no
+       if test x$enable_gudev != xno; then
+-        PKG_CHECK_MODULES(LIBWACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION])
+-        PKG_CHECK_MODULES(WACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst gudev-1.0 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION xorg-wacom librsvg-2.0 >= $LIBRSVG_REQUIRED_VERSION libnotify >= $LIBNOTIFY_REQUIRED_VERSION pango >= $PANGO_REQUIRED_VERSION])
+-        PKG_CHECK_MODULES(WACOM_OLED, [gudev-1.0])
++        AC_ARG_ENABLE([wacom],
++          AS_HELP_STRING([--disable-wacom],
++                         [turn off wacom plugin]),
++                         [with_wacom=$enableval],
++                         [with_wacom=no]) dnl Default value
++        if test x$with_wacom = xyes; then
++          PKG_CHECK_MODULES(LIBWACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION])
++          PKG_CHECK_MODULES(WACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst gudev-1.0 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION xorg-wacom librsvg-2.0 >= $LIBRSVG_REQUIRED_VERSION libnotify >= $LIBNOTIFY_REQUIRED_VERSION pango >= $PANGO_REQUIRED_VERSION])
++          PKG_CHECK_MODULES(WACOM_OLED, [gudev-1.0])
++          have_wacom=yes
++          AC_DEFINE_UNQUOTED(HAVE_WACOM, 1, [Define to 1 if wacom support is available])
++        fi
++        AC_SUBST(WACOM_CFLAGS)
++        AC_SUBST(WACOM_LIBS)
+       else
+         AC_MSG_ERROR([GUdev is necessary to compile Wacom support])
+       fi
+-      AC_DEFINE_UNQUOTED(HAVE_WACOM, 1, [Define to 1 if wacom support is available])
+-      have_wacom=yes
+     fi
+     ;;
+   *)
+diff --git a/plugins/Makefile.am b/plugins/Makefile.am
+index 7365953..779b5d9 100644
+--- a/plugins/Makefile.am
++++ b/plugins/Makefile.am
+@@ -4,7 +4,6 @@ enabled_plugins =	\
+ 	a11y-keyboard	\
+ 	a11y-settings	\
+ 	clipboard	\
+-	color		\
+ 	datetime	\
+ 	dummy		\
+ 	power		\
+@@ -21,6 +20,12 @@ enabled_plugins =	\
+ 
+ disabled_plugins = $(NULL)
+ 
++if WITH_COLOR
++enabled_plugins += color
++else
++disabled_plugins += color
++endif
++
+ if SMARTCARD_SUPPORT
+ enabled_plugins += smartcard
+ else
+-- 
+2.0.5
+
diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.16.2-settings_set_display.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.16.2-settings_set_display.patch
new file mode 100644
index 000000000000..a8116b6d0177
--- /dev/null
+++ b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.16.2-settings_set_display.patch
@@ -0,0 +1,47 @@
+From 804a75e86c8aafa46ff3c99933d1c8cd54ba7fcc Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Mon, 25 May 2015 12:35:13 -0400
+Subject: [PATCH] common: settings_set_display(): fix segfault when output ==
+ NULL
+
+If settings_set_display() was called with output == NULL, edid remained
+initialized to NULLs, but an array of NULLs is an illegal value for
+KEY_DISPLAY settings, which has type "as".
+
+https://bugzilla.gnome.org/show_bug.cgi?id=749844
+---
+ plugins/common/gsd-device-mapper.c | 11 +++++++----
+ 1 file changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/plugins/common/gsd-device-mapper.c b/plugins/common/gsd-device-mapper.c
+index ce70fd0..c8a1a1a 100644
+--- a/plugins/common/gsd-device-mapper.c
++++ b/plugins/common/gsd-device-mapper.c
+@@ -365,7 +365,8 @@ static void
+ settings_set_display (GSettings	    *settings,
+ 		      GnomeRROutput *output)
+ {
+-	gchar **prev, *edid[4] = { NULL, NULL, NULL, NULL };
++	/* KEY_DISPLAY is type "as", so edid[0..2] must not be NULL */
++	gchar **prev, *edid[4] = { "", "", "", NULL };
+ 	GVariant *value;
+ 	gsize nvalues;
+ 
+@@ -384,9 +385,11 @@ settings_set_display (GSettings	    *settings,
+ 		g_settings_set_value (settings, KEY_DISPLAY, value);
+ 	}
+ 
+-	g_free (edid[0]);
+-	g_free (edid[1]);
+-	g_free (edid[2]);
++	if (output) {
++		g_free (edid[0]);
++		g_free (edid[1]);
++		g_free (edid[2]);
++	}
+ 	g_strfreev (prev);
+ }
+ 
+-- 
+2.4.1
+
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.14.3.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.16.2-r1.ebuild
index 32c3a6d42398..995e7b78be78 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.14.3.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.16.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.14.3.ebuild,v 1.1 2015/03/28 16:07:02 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.16.2-r1.ebuild,v 1.1 2015/06/09 14:21:45 eva Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -24,9 +24,9 @@ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebs
 
 COMMON_DEPEND="
 	>=dev-libs/glib-2.37.7:2[dbus]
-	>=x11-libs/gtk+-3.7.8:3
+	>=x11-libs/gtk+-3.15.3:3
 	>=gnome-base/gnome-desktop-3.11.1:3=
-	>=gnome-base/gsettings-desktop-schemas-3.9.91.1
+	>=gnome-base/gsettings-desktop-schemas-3.15.4
 	>=gnome-base/librsvg-2.36.2
 	media-fonts/cantarell
 	media-libs/fontconfig
@@ -101,7 +101,10 @@ src_prepare() {
 		epatch "${FILESDIR}"/${PN}-3.7.90-short-touchpad-timeout.patch
 
 	# Make colord and wacom optional; requires eautoreconf
-	epatch "${FILESDIR}"/${PN}-3.14.0-optional.patch
+	epatch "${FILESDIR}"/${PN}-3.16.0-optional.patch
+
+	# Fix segfault, https://bugzilla.gnome.org/show_bug.cgi?id=749844
+	epatch "${FILESDIR}"/${PN}-3.16.2-settings_set_display.patch
 
 	epatch_user
 	eautoreconf