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

Package-Manager: portage-2.1.5_rc2

3 files changed, 82 insertions, 5 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/Manifest b/gnome-base/gnome-session/Manifest
index 3eeae9a25d3b..e43e58526bc2 100644
--- a/gnome-base/gnome-session/Manifest
+++ b/gnome-base/gnome-session/Manifest
@@ -7,16 +7,18 @@ AUX gnome-session-2.19.2-no-asserts.patch 865 RMD160 c69115c8a6e0821d361c6354c6c
 DIST gentoo-splash.png 78064 RMD160 e75052892920e1c919aae1f6e53853c27b2e063f SHA1 e93c5f77389a5351af9948f7677c5592355cf860 SHA256 24fa48bc26db0d446e0098b3e94fd3cdec4610faca0b3282da0bec79bedbc179
 DIST gnome-session-2.20.3.tar.bz2 751906 RMD160 0e70455a1b776babc86ff472b6f7fd86a7c305e2 SHA1 cb76fbd436f43c51eed81d8fb3f7b3478e40d3e4 SHA256 eff4f7a1eb15a9a92317de9c07f9530ce1110c9ac84fc777f97a59316b9f2ee1
 DIST gnome-session-2.22.0.tar.bz2 778868 RMD160 15fdf73773c0456d7021606f0893ef3eea55c4b6 SHA1 48163f812931166e50d2d4c882eb3f13a4b1b202 SHA256 ae426a2f356012aea1086dca89e0551d6970c404a56e31b814a53e24eab19939
+DIST gnome-session-2.22.1.1.tar.bz2 773504 RMD160 0d8b26f95cee389e8aefd05251e16b7cd3703aa3 SHA1 54ba733ec8c8530a1f9c03b9f11d66bf3e666163 SHA256 d30cc06bfa92f373577761ab56f718c146c6b207614746094ea4412f514f9384
 DIST gnome-session-2.22.1.tar.bz2 773191 RMD160 5e261fbd6be9b27f3e460eb984e7c61166ca2681 SHA1 a5713e5b26d3d1eac5ea9afa1218f127765bf907 SHA256 b47063cddd3b0acf4c79573924042043d497b8c86f96ddd47ab4b453b6b7eb69
 EBUILD gnome-session-2.20.3.ebuild 1852 RMD160 9d0a8f0496c73e13e5eb7c0687dacf1eb5a0473c SHA1 7f20579dd77215848769f034a9588efcafbedee7 SHA256 c12b4eed592636b1ec749a1158f11e07a0a0b3b30162a33f2cdfc2d614fad43d
 EBUILD gnome-session-2.22.0.ebuild 1919 RMD160 bb321dc65fcd5b69a39b72adf3bc16ff8acafe10 SHA1 5d10d277d609fe4961e81e515b2e9f56da85ef37 SHA256 f6eb2e8c05029e613857b9bc24b925a1732a5ad76eb309142bc181ef80169aef
+EBUILD gnome-session-2.22.1.1.ebuild 1921 RMD160 e9d6d6f78d66d25cd025f7002a1011cb04666511 SHA1 5e1da8da2ad43b42903b33a6fad85189de884a7c SHA256 22f4a909b54e08d145dff0efdf124055a64e6d8f89148a6dfe25084d6089670d
 EBUILD gnome-session-2.22.1.ebuild 1919 RMD160 ca5a369835d68c08f2c77dea15c91e787093a783 SHA1 76e6fa80e4d739ee313af68cee34ddf69443992e SHA256 983a0b1214956d407f4c87c5db4039bf9cb2adb71ab1a9a0e702740545ca4d94
-MISC ChangeLog 28476 RMD160 b6824be16c35aa341eac2f2cb0bce09ea853fb1e SHA1 6f9fd2274c276efb329db50bfd074af2b033957b SHA256 e5b7330aece1d5f379e2b993e840c167f1f4d55670dd53887247a34e1e19de21
+MISC ChangeLog 28665 RMD160 08b21c66bc5dc80ab4ad492da564b18d8e45324a SHA1 b0fe0fe02a52c5060b99db8b0bf83b8a59f652ba SHA256 374b85912401cbc01416c62ef755d63f5755910120674d2894969243c5bb40a9
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkf9QoQACgkQ1fmVwcYIWAbEyACgsvtBm4boLyGVKkXNQmev3tJC
-XpsAoIM6W2zZUTa8SheBnJ8ssXLrIbO/
-=biAR
+iEYEARECAAYFAkf+mnAACgkQ1fmVwcYIWAbUXwCfSsavGHaQ+pv2qsinQssMhCq/
+t94AoMIPtXGqUJdGOiU0FyXpXpiODr00
+=Bn9r
 -----END PGP SIGNATURE-----
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
+}