Version bump for Gnome 3.10

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

2 files changed, 13 insertions, 7 deletions

diff --git a/gnome-base/gnome-session/ChangeLog b/gnome-base/gnome-session/ChangeLog
index e9a3f835e1ae..2a72f9035508 100644
--- a/gnome-base/gnome-session/ChangeLog
+++ b/gnome-base/gnome-session/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-base/gnome-session
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/ChangeLog,v 1.327 2013/12/08 18:33:57 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/ChangeLog,v 1.328 2013/12/24 16:33:10 pacho Exp $
+
+*gnome-session-3.10.1 (24 Dec 2013)
+
+  24 Dec 2013; Pacho Ramos <pacho@gentoo.org> +gnome-session-3.10.1.ebuild,
+  -gnome-session-3.8.4.ebuild:
+  Version bump for Gnome 3.10
 
   08 Dec 2013; Pacho Ramos <pacho@gentoo.org> gnome-session-3.8.4-r1.ebuild:
   x86 stable, bug #478252
diff --git a/gnome-base/gnome-session/gnome-session-3.8.4.ebuild b/gnome-base/gnome-session/gnome-session-3.10.1.ebuild
index 2b955a23293b..1501ade937ab 100644
--- a/gnome-base/gnome-session/gnome-session-3.8.4.ebuild
+++ b/gnome-base/gnome-session/gnome-session-3.10.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/gnome-session-3.8.4.ebuild,v 1.1 2013/07/31 03:36:31 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/gnome-session-3.10.1.ebuild,v 1.1 2013/12/24 16:33:10 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"
@@ -25,7 +25,7 @@ COMMON_DEPEND="
 	>=x11-libs/gtk+-2.90.7:3
 	>=dev-libs/json-glib-0.10
 	>=dev-libs/dbus-glib-0.76
-	>=gnome-base/gnome-desktop-3.7.90:3
+	>=gnome-base/gnome-desktop-3.9.91:3=
 	>=sys-power/upower-0.9.0
 	elibc_FreeBSD? ( dev-libs/libexecinfo )
 
@@ -70,11 +70,11 @@ DEPEND="${COMMON_DEPEND}
 # gnome-base/gdm does not provide gnome.desktop anymore
 
 src_prepare() {
-	# Silence errors due to weird checks for libX11
-	sed -e 's/\(PANGO_PACKAGES="\)pangox/\1/' -i configure.ac configure || die
-
 	# Allow people to configure startup apps, bug #464968, upstream bug #663767
-	sed -i -e '/NoDisplay/d' data/session-properties.desktop.in.in || die
+	sed -i -e '/NoDisplay/d' data/gnome-session-properties.desktop.in.in || die
+
+	# Blacklist nv25 (from 'master')
+	epatch "${FILESDIR}"/${PN}-3.8.4-blacklist-nv25.patch
 
 	gnome2_src_prepare
 }