Version bump for Gnome 3.16. Clean up old revision.

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

4 files changed, 10 insertions, 93 deletions

diff --git a/gnome-base/gdm/ChangeLog b/gnome-base/gdm/ChangeLog
index 7680c047d700..1e959bdf9ffc 100644
--- a/gnome-base/gdm/ChangeLog
+++ b/gnome-base/gdm/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-base/gdm
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.418 2015/04/19 14:24:07 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.419 2015/06/09 15:26:22 eva Exp $
+
+*gdm-3.16.1.1 (09 Jun 2015)
+
+  09 Jun 2015; Gilles Dartiguelongue <eva@gentoo.org> -gdm-3.12.2-r2.ebuild,
+  +gdm-3.16.1.1.ebuild, -files/gdm-3.12.2-SIGUSR1-blocking.patch,
+  -files/gdm-3.12.2-SIGUSR1-blocking-1.patch:
+  Version bump for Gnome 3.16. Clean up old revision.
 
 *gdm-3.14.2 (19 Apr 2015)
 
diff --git a/gnome-base/gdm/files/gdm-3.12.2-SIGUSR1-blocking-1.patch b/gnome-base/gdm/files/gdm-3.12.2-SIGUSR1-blocking-1.patch
deleted file mode 100644
index 68b0c35aa22a..000000000000
--- a/gnome-base/gdm/files/gdm-3.12.2-SIGUSR1-blocking-1.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From abaa3e6cd96ca80560848f17a6a314c8405735d6 Mon Sep 17 00:00:00 2001
-From: Colomban Wendling <ban@herbesfolles.org>
-Date: Mon, 1 Sep 2014 01:21:04 +0200
-Subject: worker: really don't block SIGUSR1
-
-The manager process alters the signal mask, so we need to reset it to
-the expected default value when launching the session as the signal
-mask is inherited from the parent.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=731228
-
-diff --git a/daemon/gdm-session-worker.c b/daemon/gdm-session-worker.c
-index bc50b37..89505c2 100644
---- a/daemon/gdm-session-worker.c
-+++ b/daemon/gdm-session-worker.c
-@@ -1836,6 +1836,7 @@ gdm_session_worker_start_session (GdmSessionWorker  *worker,
-                 char  *home_dir;
-                 int    stdin_fd = -1, stdout_fd = -1, stderr_fd = -1;
-                 gboolean has_journald = FALSE;
-+                sigset_t mask;
- 
-                 /* Leak the TTY into the session as stdin so that it stays open
-                  * without any races. */
-@@ -1950,6 +1951,13 @@ gdm_session_worker_start_session (GdmSessionWorker  *worker,
-                  */
-                 signal (SIGUSR1, SIG_DFL);
- 
-+                /*
-+                 * Reset signal mask to default since it was altered by the
-+                 * manager process
-+                 */
-+                sigemptyset (&mask);
-+                sigprocmask (SIG_SETMASK, &mask, NULL);
-+
-                 gdm_session_execute (worker->priv->arguments[0],
-                                      worker->priv->arguments,
-                                      (char **)
--- 
-cgit v0.10.1
-
diff --git a/gnome-base/gdm/files/gdm-3.12.2-SIGUSR1-blocking.patch b/gnome-base/gdm/files/gdm-3.12.2-SIGUSR1-blocking.patch
deleted file mode 100644
index 6aff0d60862d..000000000000
--- a/gnome-base/gdm/files/gdm-3.12.2-SIGUSR1-blocking.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From ef6954833cf43bef8306823d7fcfb6a04b903ad7 Mon Sep 17 00:00:00 2001
-From: Ray Strode <rstrode@redhat.com>
-Date: Fri, 30 May 2014 10:26:02 -0400
-Subject: worker: don't block SIGUSR1
-
-When the slaves were folded into the main manager process, we had
-to add support for detecting multiple simultaneous X servers starting
-up.
-
-We did that by creating a detected thread to listen for SIGUSR1 and
-then examining the siginfo to find out which X server is ready.
-
-In order to ensure only the dedicated thread received the SIGUSR1
-signals from the X server we blocked SIGUSR1 from the main thread.
-
-That blocked signal is inherited to the worker processes and the
-session.  Some programs depend on SIGUSR1 but don't explicitly unblock
-SIGUSR1 at start up, since the signal is presumed to be unblocked out
-the box.
-
-This commit makes sure SIGUSR1 is unblocked before starting the session
-to keep these programs functioning correctly.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=731228
-
-diff --git a/daemon/gdm-session-worker.c b/daemon/gdm-session-worker.c
-index 8af97b0..bc50b37 100644
---- a/daemon/gdm-session-worker.c
-+++ b/daemon/gdm-session-worker.c
-@@ -1944,6 +1944,12 @@ gdm_session_worker_start_session (GdmSessionWorker  *worker,
-                  */
-                 signal (SIGPIPE, SIG_DFL);
- 
-+                /*
-+                 * Reset SIGUSR1 to default since it was blocked by the manager
-+                 * process for the X server startup handshake
-+                 */
-+                signal (SIGUSR1, SIG_DFL);
-+
-                 gdm_session_execute (worker->priv->arguments[0],
-                                      worker->priv->arguments,
-                                      (char **)
--- 
-cgit v0.10.1
-
diff --git a/gnome-base/gdm/gdm-3.12.2-r2.ebuild b/gnome-base/gdm/gdm-3.16.1.1.ebuild
index 0378bc4c9ef2..ef91141c71f8 100644
--- a/gnome-base/gdm/gdm-3.12.2-r2.ebuild
+++ b/gnome-base/gdm/gdm-3.16.1.1.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/gdm/gdm-3.12.2-r2.ebuild,v 1.1 2015/01/02 11:24:36 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-3.16.1.1.ebuild,v 1.1 2015/06/09 15:26:22 eva Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"
@@ -23,7 +23,7 @@ LICENSE="
 SLOT="0"
 IUSE="accessibility audit branding fprint +introspection ipv6 plymouth selinux smartcard +systemd tcpd test wayland xinerama"
 REQUIRED_USE="wayland? ( systemd )"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
 
 # NOTE: x11-base/xorg-server dep is for X_SERVER_PATH etc, bug #295686
 # nspr used by smartcard extension
@@ -49,7 +49,6 @@ COMMON_DEPEND="
 	x11-libs/libXdmcp
 	x11-libs/libXext
 	x11-libs/libXft
-	x11-libs/libXrandr
 	>=x11-misc/xdg-utils-1.0.2-r3
 
 	virtual/pam
@@ -80,7 +79,6 @@ RDEPEND="${COMMON_DEPEND}
 
 	accessibility? (
 		>=app-accessibility/orca-3.10
-		app-accessibility/caribou
 		gnome-extra/mousetweaks )
 	fprint? (
 		sys-auth/fprintd
@@ -141,9 +139,6 @@ src_prepare() {
 	# Show logo when branding is enabled
 	use branding && epatch "${FILESDIR}/${PN}-3.8.4-logo.patch"
 
-	# Don't block SIGUSR1, bug #524008 (from 'master')
-	epatch "${FILESDIR}"/${PN}-3.12.2-SIGUSR1-blocking{,-1}.patch
-
 	eautoreconf
 
 	gnome2_src_prepare