bump to 2.22.1.1. Fix a crash in the trash migration code.

(Portage version: 2.1.5_rc2)

2 files changed, 76 insertions, 1 deletions

diff --git a/gnome-base/gnome-session/ChangeLog b/gnome-base/gnome-session/ChangeLog
index a19ade63791b..fcae14667c1b 100644
--- a/gnome-base/gnome-session/ChangeLog
+++ b/gnome-base/gnome-session/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-base/gnome-session
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/ChangeLog,v 1.211 2008/04/09 22:26:04 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/ChangeLog,v 1.212 2008/04/10 22:53:29 eva Exp $
+
+*gnome-session-2.22.1.1 (10 Apr 2008)
+
+  10 Apr 2008; Gilles Dartiguelongue <eva@gentoo.org>
+  +gnome-session-2.22.1.1.ebuild:
+  bump to 2.22.1.1. Fix a crash in the trash migration code.
 
 *gnome-session-2.22.1 (09 Apr 2008)
 
diff --git a/gnome-base/gnome-session/gnome-session-2.22.1.1.ebuild b/gnome-base/gnome-session/gnome-session-2.22.1.1.ebuild
new file mode 100644
index 000000000000..0eec41c5d19f
--- /dev/null
+++ b/gnome-base/gnome-session/gnome-session-2.22.1.1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2008 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.22.1.1.ebuild,v 1.1 2008/04/10 22:53:29 eva Exp $
+
+inherit eutils gnome2
+
+DESCRIPTION="Gnome session manager"
+HOMEPAGE="http://www.gnome.org/"
+SRC_URI="${SRC_URI}
+		 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 ipv6 tcpd"
+
+RDEPEND=">=dev-libs/glib-2.13
+		 >=gnome-base/libgnomeui-2.2
+		 >=x11-libs/gtk+-2.11.1
+		 >=dev-libs/dbus-glib-0.71
+		 >=gnome-base/gnome-keyring-2.21.92
+		 gnome-base/gnome-settings-daemon
+		 >=x11-libs/libnotify-0.2.1
+		 x11-libs/libXau
+		 x11-apps/xdpyinfo
+		 >=gnome-base/control-center-2.15.4
+		 >=gnome-base/gconf-2
+		 tcpd? ( >=sys-apps/tcp-wrappers-7.6 )"
+DEPEND="${RDEPEND}
+		  x11-apps/xrdb
+		>=sys-devel/gettext-0.10.40
+		>=dev-util/pkgconfig-0.17
+		>=dev-util/intltool-0.35
+		!gnome-base/gnome-core
+		!<gnome-base/gdm-2.20.4"
+
+# gnome-base/gnome-core overwrite /usr/bin/gnome-session
+# gnome-base/gdm does not provide gnome.desktop anymore
+
+DOCS="AUTHORS ChangeLog HACKING NEWS README"
+
+pkg_setup() {
+	# TODO: convert libnotify to a configure option
+	G2CONF="${G2CONF} $(use_enable ipv6) $(use_enable tcpd tcp-wrappers)"
+}
+
+src_unpack() {
+	gnome2_src_unpack
+
+	# Patch for Gentoo Branding (bug #42687)
+	use branding && epatch "${FILESDIR}/${PN}-2.17.90.1-gentoo-branding.patch"
+
+	# Get rid of random asserts in tons of programs due to development versions
+	epatch "${FILESDIR}/${PN}-2.19.2-no-asserts.patch"
+}
+
+src_install() {
+	gnome2_src_install
+
+	dodir /etc/X11/Sessions
+	exeinto /etc/X11/Sessions
+	doexe "${FILESDIR}/Gnome"
+
+	# Our own splash for world domination
+	if use branding ; then
+		insinto /usr/share/pixmaps/splash/
+		doins "${DISTDIR}/gentoo-splash.png"
+	fi
+}