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

Whitespace fixes in files/Gnome from overlay
Package-Manager: portage-2.2_rc33/cvs/Linux i686

4 files changed, 100 insertions, 11 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/Manifest b/gnome-base/gnome-session/Manifest
index 8fb22bfa9634..492731a81949 100644
--- a/gnome-base/gnome-session/Manifest
+++ b/gnome-base/gnome-session/Manifest
@@ -1,4 +1,4 @@
-AUX Gnome 2464 RMD160 07fe125890d825fdf95fe532aeec07c2718cf64e SHA1 9d64837491953dd8c38142e50e0cd36d015db583 SHA256 a1214ba383eb6dbd32b34eb89c7e00df08f9284b7a2b8a82f291cb29e865ba02
+AUX Gnome 2457 RMD160 71b084bf46db8f1551b21b843e5ee12015bc836e SHA1 7b6f633d6000554977f69869aae2b817166f59a2 SHA256 347b9e364607b25637205c3984a3662518395ca2e200578e6b976a6c73ad63a7
 AUX gnome-session-2.17.90.1-gentoo-branding.patch 705 RMD160 162b7da162bc94534491f6c0a0c772265268386c SHA1 c17b429a1d0b1d7f043ae1d6c88ab4f7894c983d SHA256 cbbd369938ac60baa255ef58d642014d1318169631bfbd3cb042efcd560187f5
 AUX gnome-session-2.19.2-no-asserts.patch 865 RMD160 c69115c8a6e0821d361c6354c6c05e9cbcdbcbdb SHA1 b3aa320808ac63eef91e5dcac17c3ebe94a0f684 SHA256 84dfd878da8933aed9b9a2d1feed47a7fdf254db542b29b5c6dcc81e8d42f122
 AUX gnome-session-2.22.3-gsd-spawn.patch 9005 RMD160 a5ef84a8701f43d91e61edf6c46264de3057f581 SHA1 3f923280228aafc242d49a6ff45f6ca9e42b9e90 SHA256 27f5a81eb52fcbb57189d4385d1e154af9dc6d1401445247cdcca18dc986dbeb
@@ -7,8 +7,11 @@ AUX gnome-session-2.24.2-shutdown.patch 2809 RMD160 a26a418511dc5ff7a56252ea005a
 DIST gentoo-splash.png 78064 RMD160 e75052892920e1c919aae1f6e53853c27b2e063f SHA1 e93c5f77389a5351af9948f7677c5592355cf860 SHA256 24fa48bc26db0d446e0098b3e94fd3cdec4610faca0b3282da0bec79bedbc179
 DIST gnome-session-2.22.3.tar.bz2 773853 RMD160 a35065aa665ada5081f3fe19abc70950f8588e34 SHA1 817e007009e6e43cd2f1980e6d90546e7117cc9d SHA256 07ec872ae8213c4e92072ff74451caa2b6afb747fd0b07d2cea40cfcd32b7176
 DIST gnome-session-2.24.3.tar.bz2 792300 RMD160 2cd9fb8435f452873ca8bd34fd51276d24282a48 SHA1 a48bcf47b879db439cec193e4191909409e7efcb SHA256 2d59d979467459261cc741c64ce2ba6aaccd7a31cccb5b13b2ea46858e1bc636
+DIST gnome-session-2.26.1-gentoo-patches.tar.bz2 6060 RMD160 acbb15102d5e2c6a17e9cd69450085bf233caf69 SHA1 aceab28c15bfe9cb18c93cc2d4fd0a7213374f1a SHA256 9189f35565a6e0b2b6a218e3eee47db0c40cff091172ab25220df9a9ee5020a8
+DIST gnome-session-2.26.1.tar.bz2 835266 RMD160 d4eb6a0fc639a257645b2e4138055d9e1bd9f9a6 SHA1 3c8dc68f197c6b5a7d30e3ce04e65954bfe12070 SHA256 35e304ec42ed69a2b98377fd7cfac19fa00ca53bb5d6307094ebf077c00dbc32
 EBUILD gnome-session-2.22.3-r1.ebuild 2115 RMD160 6c9fbb9072b38fb9e162048f6c30706d03fe5f27 SHA1 a21447d9e69e27761089f98f272910e7ce16a2ed SHA256 da10117a817ea92d8be4371fb263d7ed2839c794f5274a6f03d2d45f353e0abe
 EBUILD gnome-session-2.22.3.ebuild 1873 RMD160 1ddd0c4904bc3e298eb10928e938b13559289ed1 SHA1 2996093608be172e0eacbeeb6a6a649d3bd6e460 SHA256 ab49e8b6ecc73a4186d1ced5ef9b0689feb9ad0a0194990da738b5eedd08ff2d
 EBUILD gnome-session-2.24.3.ebuild 1948 RMD160 5897beb4dae8fc6f363fdf1c87c0b12b75b6634e SHA1 63c1d8ab8e21d94b465ada3c5db54225aac66f31 SHA256 51bb5a07493cff28b99a0affd796d53ea3561ea697b456b213ca935e9eea7c41
-MISC ChangeLog 31929 RMD160 5fc82e224192d8a90e2c128478b92888072de68d SHA1 28f421d591a622b42b861873279ac144f13952ea SHA256 be44afe9c97ec477ae3f41177001cb936b78581eb698045d608e2ff5bd0b4c2a
+EBUILD gnome-session-2.26.1.ebuild 2047 RMD160 98d3e1a431ad8d62c5913e2a2d0601e6c0968920 SHA1 5750a4eba4cf15453a604a6d2191d107d86cb7c1 SHA256 f9cdbf47bd83f95b2272206744737ca24ece47b7416d12a8cc241f2772d9de5c
+MISC ChangeLog 32178 RMD160 c87894637039dffc6b468c691be16dc41ea8bd07 SHA1 755af272d40e960a046308efcdb218bad6e1357b SHA256 c1ebb629f3f0da9392db2fb61f4ed2dbc82d74d73e0e3370cde22313396cfd6e
 MISC metadata.xml 269 RMD160 6bbdafdb02cf28eb4f772d7e330519eb07ab4dcb SHA1 18a2628db0509bf3ccd54f626f3bdd4b7c3a7a43 SHA256 a735ba6a51fe0c18552eda7327e431b231fd7b590a82ba9f1cc32b0c1a38e50e
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
+}