Bump to 2.26.1: We now have session-saving support again.

Whitespace fixes in files/Gnome from overlay
(Portage version: 2.2_rc33/cvs/Linux i686)

3 files changed, 95 insertions, 9 deletions

diff --git a/gnome-base/gnome-session/ChangeLog b/gnome-base/gnome-session/ChangeLog
index d67546b22c7a..a42453462f84 100644
--- a/gnome-base/gnome-session/ChangeLog
+++ b/gnome-base/gnome-session/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-base/gnome-session
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/ChangeLog,v 1.233 2009/04/27 14:35:32 jer Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/ChangeLog,v 1.234 2009/05/13 16:41:37 nirbheek Exp $
+
+*gnome-session-2.26.1 (13 May 2009)
+
+  13 May 2009; Nirbheek Chauhan <nirbheek@gentoo.org>
+  +gnome-session-2.26.1.ebuild, files/Gnome:
+  Bump to 2.26.1: We now have session-saving support again.
+  Whitespace fixes in files/Gnome from overlay
 
   27 Apr 2009; Jeroen Roovers <jer@gentoo.org> gnome-session-2.22.3-r1:
   Stable for HPPA (bug #260063).
diff --git a/gnome-base/gnome-session/files/Gnome b/gnome-base/gnome-session/files/Gnome
index 2e8969ba69c4..98fe26d86de9 100644
--- a/gnome-base/gnome-session/files/Gnome
+++ b/gnome-base/gnome-session/files/Gnome
@@ -21,16 +21,16 @@ done
 #  and I'll try to make the script detect the distro stuff
 #
 
-userresources=$HOME/.Xresources 
-usermodmap=$HOME/.Xmodmap 
+userresources=$HOME/.Xresources
+usermodmap=$HOME/.Xmodmap
 userxkbmap=$HOME/.Xkbmap
 
-sysresources=/etc/X11/Xresources 
-sysmodmap=/etc/X11/Xmodmap 
+sysresources=/etc/X11/Xresources
+sysmodmap=/etc/X11/Xmodmap
 sysxkbmap=/etc/X11/Xkbmap
 
-rh6sysresources=/etc/X11/xinit/Xresources 
-rh6sysmodmap=/etc/X11/xinit/Xmodmap 
+rh6sysresources=/etc/X11/xinit/Xresources
+rh6sysmodmap=/etc/X11/xinit/Xmodmap
 
 if [ -x "$HOME/.gnomerc" ]; then
 	command="$HOME/.gnomerc"
@@ -110,4 +110,3 @@ if [ -d /etc/X11/xinit/xinitrc.d ]; then
 fi
 
 exec $command
-
diff --git a/gnome-base/gnome-session/gnome-session-2.26.1.ebuild b/gnome-base/gnome-session/gnome-session-2.26.1.ebuild
new file mode 100644
index 000000000000..afc94d31e35d
--- /dev/null
+++ b/gnome-base/gnome-session/gnome-session-2.26.1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/gnome-session-2.26.1.ebuild,v 1.1 2009/05/13 16:41:37 nirbheek Exp $
+
+EAPI="2"
+
+inherit eutils gnome2
+
+DESCRIPTION="Gnome session manager"
+HOMEPAGE="http://www.gnome.org/"
+SRC_URI="${SRC_URI}
+	${P}-gentoo-patches.tar.bz2
+	branding? ( mirror://gentoo/gentoo-splash.png )"
+
+LICENSE="GPL-2 LGPL-2 FDL-1.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+
+IUSE="branding doc ipv6 policykit"
+
+RDEPEND=">=dev-libs/glib-2.16
+	>=x11-libs/gtk+-2.11.1
+	>=gnome-base/libglade-2.3.6
+	>=dev-libs/dbus-glib-0.76
+	>=gnome-base/gconf-2
+	>=x11-libs/startup-notification-0.9
+	policykit? ( >=gnome-extra/policykit-gnome-0.7 )
+
+	x11-libs/libSM
+	x11-libs/libICE
+	x11-libs/libX11
+	x11-libs/libXtst
+	x11-apps/xdpyinfo"
+DEPEND="${RDEPEND}
+	>=dev-lang/perl-5
+	>=sys-devel/gettext-0.10.40
+	>=dev-util/pkgconfig-0.17
+	>=dev-util/intltool-0.40
+	!<gnome-base/gdm-2.20.4
+	doc? (
+		app-text/xmlto
+		dev-libs/libxslt )"
+# gnome-base/gdm does not provide gnome.desktop anymore
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+pkg_setup() {
+	# TODO: convert libnotify to a configure option
+	G2CONF="${G2CONF}
+		$(use_enable doc docbook-docs)
+		$(use_enable ipv6)
+		$(use_enable policykit polkit)"
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Patch for Gentoo Branding (bug #42687)
+	use branding && epatch "${FILESDIR}/${PN}-2.17.90.1-gentoo-branding.patch"
+
+	# Fix shutdown/restart capability, upstream bug #549150
+	epatch "${WORKDIR}/${PN}-2.26.1-shutdown.patch"
+
+	# Add "session saving" button back, upstream bug #575544
+	epatch "${WORKDIR}/${PN}-2.26.1-session-saving-button.patch"
+}
+
+src_install() {
+	gnome2_src_install
+
+	dodir /etc/X11/Sessions
+	exeinto /etc/X11/Sessions
+	doexe "${FILESDIR}/Gnome" || die "doexe failed"
+
+	# Our own splash for world domination
+	if use branding ; then
+		insinto /usr/share/pixmaps/splash/
+		doins "${DISTDIR}/gentoo-splash.png" || die "doins failed"
+	fi
+}