Version bump for Gnome 3.14. Clean up old revision.

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

6 files changed, 43 insertions, 24 deletions

diff --git a/gnome-base/gdm/ChangeLog b/gnome-base/gdm/ChangeLog
index 5a365d0b59a9..7857ef8e2448 100644
--- a/gnome-base/gdm/ChangeLog
+++ b/gnome-base/gdm/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnome-base/gdm
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.413 2014/12/19 13:37:11 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.414 2014/12/22 21:17:35 eva Exp $
+
+*gdm-3.14.1 (22 Dec 2014)
+
+  22 Dec 2014; Gilles Dartiguelongue <eva@gentoo.org> -gdm-3.12.2.ebuild,
+  +gdm-3.14.1.ebuild, files/gdm-2.32.0-xinitrc-ssh-agent.patch,
+  files/gdm-3.2.1.1-custom-session.patch,
+  files/gdm-3.8.4-fingerprint-auth.patch, files/gdm-3.8.4-logo.patch:
+  Version bump for Gnome 3.14. Clean up old revision.
 
   19 Dec 2014; Pacho Ramos <pacho@gentoo.org> gdm-3.12.2-r1.ebuild:
   amd64 stable, bug 529964
diff --git a/gnome-base/gdm/files/gdm-2.32.0-xinitrc-ssh-agent.patch b/gnome-base/gdm/files/gdm-2.32.0-xinitrc-ssh-agent.patch
index b1cddf1758c4..bfd8398af2b3 100644
--- a/gnome-base/gdm/files/gdm-2.32.0-xinitrc-ssh-agent.patch
+++ b/gnome-base/gdm/files/gdm-2.32.0-xinitrc-ssh-agent.patch
@@ -1,18 +1,18 @@
-From 1cb1841da3a8fedc1671637e2828d5e361af21fa Mon Sep 17 00:00:00 2001
+From c0581264d5e2b412aa27dc30623512b461024e4f Mon Sep 17 00:00:00 2001
 From: Gilles Dartiguelongue <eva@gentoo.org>
 Date: Tue, 2 Nov 2010 23:19:31 +0100
-Subject: [PATCH 5/6] ssh-agent handling must be done at xinitrc.d
+Subject: [PATCH 2/4] ssh-agent handling must be done at xinitrc.d
 
 Gentoo bug: #220603
 ---
- data/Xsession.in |    8 --------
- 1 files changed, 0 insertions(+), 8 deletions(-)
+ data/Xsession.in | 8 --------
+ 1 file changed, 8 deletions(-)
 
 diff --git a/data/Xsession.in b/data/Xsession.in
-index 0da187d..aa49b90 100755
+index 201be92..88f1fd9 100755
 --- a/data/Xsession.in
 +++ b/data/Xsession.in
-@@ -189,14 +189,6 @@ if [ -d /etc/X11/xinit/xinitrc.d ]; then
+@@ -191,14 +191,6 @@ if [ -d /etc/X11/xinit/xinitrc.d ]; then
      done
  fi
  
@@ -28,5 +28,5 @@ index 0da187d..aa49b90 100755
  
  eval exec $command
 -- 
-1.7.3.1
+1.8.5.1
 
diff --git a/gnome-base/gdm/files/gdm-3.2.1.1-custom-session.patch b/gnome-base/gdm/files/gdm-3.2.1.1-custom-session.patch
index 0642f7c014ba..c27f8fd39e29 100644
--- a/gnome-base/gdm/files/gdm-3.2.1.1-custom-session.patch
+++ b/gnome-base/gdm/files/gdm-3.2.1.1-custom-session.patch
@@ -1,14 +1,14 @@
-From b96c19976b6876648fd91949f78f06cf5d269b18 Mon Sep 17 00:00:00 2001
+From e61ece2b42b270dd3f68718fef291be7b7f44aa6 Mon Sep 17 00:00:00 2001
 From: Gilles Dartiguelongue <eva@gentoo.org>
 Date: Tue, 2 Nov 2010 23:19:07 +0100
-Subject: [PATCH] make custom session work
+Subject: [PATCH 1/4] make custom session work
 
 Gentoo bug: #216984
 
 fix custom sessions not doing sourcing in the proper order.
 ---
- data/Xsession.in |   18 +++++++++---------
- 1 files changed, 9 insertions(+), 9 deletions(-)
+ data/Xsession.in | 18 +++++++++---------
+ 1 file changed, 9 insertions(+), 9 deletions(-)
 
 diff --git a/data/Xsession.in b/data/Xsession.in
 index 118518c..201be92 100755
@@ -47,5 +47,5 @@ index 118518c..201be92 100755
  sshagent="`gdmwhich ssh-agent`"
  if [ -n "$sshagent" ] && [ -x "$sshagent" ] && [ -z "$SSH_AUTH_SOCK" ]; then
 -- 
-1.7.7
+1.8.5.1
 
diff --git a/gnome-base/gdm/files/gdm-3.8.4-fingerprint-auth.patch b/gnome-base/gdm/files/gdm-3.8.4-fingerprint-auth.patch
index 3b56daf2a32a..cd19077a5f1d 100644
--- a/gnome-base/gdm/files/gdm-3.8.4-fingerprint-auth.patch
+++ b/gnome-base/gdm/files/gdm-3.8.4-fingerprint-auth.patch
@@ -1,7 +1,7 @@
-From 6139570c977561549747d5200b33be9786e95529 Mon Sep 17 00:00:00 2001
+From 75fe02c2b383b27b202940bdedd7d8d2c64169fb Mon Sep 17 00:00:00 2001
 From: Alexandre Rostovtsev <tetromino@gentoo.org>
 Date: Tue, 30 Jul 2013 22:56:30 -0400
-Subject: [PATCH] Gentoo does not have a fingerprint-auth pam stack
+Subject: [PATCH 3/4] Gentoo does not have a fingerprint-auth pam stack
 
 ---
  data/pam-exherbo/gdm-fingerprint.pam | 7 ++++++-
@@ -25,5 +25,5 @@ index 41639ec..d9633fb 100644
  
  password required pam_deny.so
 -- 
-1.8.3.2
+1.8.5.1
 
diff --git a/gnome-base/gdm/files/gdm-3.8.4-logo.patch b/gnome-base/gdm/files/gdm-3.8.4-logo.patch
index ef565d69ec14..151d4bc77f42 100644
--- a/gnome-base/gdm/files/gdm-3.8.4-logo.patch
+++ b/gnome-base/gdm/files/gdm-3.8.4-logo.patch
@@ -1,5 +1,16 @@
---- data/org.gnome.login-screen.gschema.xml.in.old	2013-10-18 21:58:06.333027980 +0200
-+++ data/org.gnome.login-screen.gschema.xml.in	2013-10-18 21:58:31.550372126 +0200
+From bcc651df77a429a6bf9b13892f71fedb1b87a069 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Wed, 11 Dec 2013 22:46:58 +0100
+Subject: [PATCH 4/4] Apply Gentoo branding
+
+---
+ data/org.gnome.login-screen.gschema.xml.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/data/org.gnome.login-screen.gschema.xml.in b/data/org.gnome.login-screen.gschema.xml.in
+index 03da374..5e81bc0 100644
+--- a/data/org.gnome.login-screen.gschema.xml.in
++++ b/data/org.gnome.login-screen.gschema.xml.in
 @@ -31,7 +31,7 @@
        </_description>
      </key>
@@ -9,3 +20,6 @@
        <_summary>
          Path to small image at top of user list
        </_summary>
+-- 
+1.8.5.1
+
diff --git a/gnome-base/gdm/gdm-3.12.2.ebuild b/gnome-base/gdm/gdm-3.14.1.ebuild
index df76915bc3d6..71989418b5fe 100644
--- a/gnome-base/gdm/gdm-3.12.2.ebuild
+++ b/gnome-base/gdm/gdm-3.14.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 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.ebuild,v 1.5 2014/09/29 15:05:17 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-3.14.1.ebuild,v 1.1 2014/12/22 21:17:35 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
@@ -129,7 +129,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	# make custom session work, bug #216984
+	# make custom session work, bug #216984, upstream bug #737578
 	epatch "${FILESDIR}/${PN}-3.2.1.1-custom-session.patch"
 
 	# ssh-agent handling must be done at xinitrc.d, bug #220603
@@ -193,9 +193,6 @@ src_install() {
 	newins "${FILESDIR}/49-keychain-r1" 49-keychain
 	newins "${FILESDIR}/50-ssh-agent-r1" 50-ssh-agent
 
-	# log, etc.
-	keepdir /var/log/gdm
-
 	# gdm user's home directory
 	keepdir /var/lib/gdm
 	fowners gdm:gdm /var/lib/gdm