New version for GNOME-2.22.2. Warning fixes and translation updates.

Package-Manager: portage-2.1.5

4 files changed, 16 insertions, 80 deletions

diff --git a/gnome-base/gnome-session/ChangeLog b/gnome-base/gnome-session/ChangeLog
index d8f1ef7e0769..b1e6592ffb87 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-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/ChangeLog,v 1.213 2008/05/08 19:16:19 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/ChangeLog,v 1.214 2008/05/26 22:48:15 eva Exp $
+
+*gnome-session-2.22.2 (26 May 2008)
+
+  26 May 2008; Gilles Dartiguelongue <eva@gentoo.org>
+  -gnome-session-2.22.0.ebuild, -gnome-session-2.22.1.ebuild,
+  +gnome-session-2.22.2.ebuild:
+  New version for GNOME-2.22.2. Warning fixes and translation updates.
 
   08 May 2008; Daniel Gryniewicz <dang@gentoo.org>
   gnome-session-2.22.1.1.ebuild:
diff --git a/gnome-base/gnome-session/Manifest b/gnome-base/gnome-session/Manifest
index 9226d13913bc..19e35da789b4 100644
--- a/gnome-base/gnome-session/Manifest
+++ b/gnome-base/gnome-session/Manifest
@@ -6,19 +6,17 @@ AUX gnome-session-2.17.90.1-gentoo-branding.patch 705 RMD160 162b7da162bc9453449
 AUX gnome-session-2.19.2-no-asserts.patch 865 RMD160 c69115c8a6e0821d361c6354c6c05e9cbcdbcbdb SHA1 b3aa320808ac63eef91e5dcac17c3ebe94a0f684 SHA256 84dfd878da8933aed9b9a2d1feed47a7fdf254db542b29b5c6dcc81e8d42f122
 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
+DIST gnome-session-2.22.2.tar.bz2 773610 RMD160 f422ee9f6508baecb7741a1bdcfb8d82c8e4d7e4 SHA1 7b3fa9e614f9c97943dfbc251b0ca1115cad2b56 SHA256 70cc766e59c91d42100153da6b345fa69998ccc5a33976bc0e3feb2759a25587
 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 1920 RMD160 5c6f632dae7ab09e11a54a189ded78a021359620 SHA1 9324a45786df6cfd0b87fc1813dc5ffe2ed55180 SHA256 748d6c4257ededde560430d18732e31ca5da4c27632914cd53dc24df0b246363
-EBUILD gnome-session-2.22.1.ebuild 1919 RMD160 ca5a369835d68c08f2c77dea15c91e787093a783 SHA1 76e6fa80e4d739ee313af68cee34ddf69443992e SHA256 983a0b1214956d407f4c87c5db4039bf9cb2adb71ab1a9a0e702740545ca4d94
-MISC ChangeLog 28825 RMD160 e605d6ccf45f23fe72c574d5b895f10b9bc43eb0 SHA1 62075c2085841dc4a4746edceca94ca04df047c0 SHA256 262c63990c6dec1b0f6ded40b3d2ed8dacf2b3614e0b9aa4cd2d46a4d90a493a
+EBUILD gnome-session-2.22.2.ebuild 1917 RMD160 4ec68f92a63c6c9da1d921b23758c0f9d575eb85 SHA1 121611efb5230655317b46db51288a9c7706f71e SHA256 c0a51034c91754c33cc004a9a1b74135b9225941f80cf9ea4882d8f4ad60d391
+MISC ChangeLog 29081 RMD160 14e210516644ebb1b5669f3b14d062adfde72653 SHA1 86da68b0560df36615c30bf2a46520cfaf63dd14 SHA256 07ac1d528f9a28447ad9723a951a5a9a19d041423522279d7cfd41c6e3d57799
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iD8DBQFII1GOomPajV0RnrERAoRJAJ0U0B/Vx7Tzr/9TaSXiJNTj42fQUACdGJIb
-5CnqeWCf+KVi4tnwZQ90ikI=
-=lLkX
+iEYEARECAAYFAkg7Pl0ACgkQ1fmVwcYIWAYotgCeKnLdw9rlOAGB7q0jKgmx/oNA
+xb0AoLUZxb5syq7F62MBfiGV/1JbWn0u
+=yn83
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-session/gnome-session-2.22.1.ebuild b/gnome-base/gnome-session/gnome-session-2.22.1.ebuild
deleted file mode 100644
index c8d471ae82a7..000000000000
--- a/gnome-base/gnome-session/gnome-session-2.22.1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# 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.ebuild,v 1.1 2008/04/09 22:26:04 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
-}
diff --git a/gnome-base/gnome-session/gnome-session-2.22.0.ebuild b/gnome-base/gnome-session/gnome-session-2.22.2.ebuild
index 70e244e592a6..90bc88859c32 100644
--- a/gnome-base/gnome-session/gnome-session-2.22.0.ebuild
+++ b/gnome-base/gnome-session/gnome-session-2.22.2.ebuild
@@ -1,6 +1,6 @@
 # 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.0.ebuild,v 1.1 2008/03/23 11:26:18 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/gnome-session-2.22.2.ebuild,v 1.1 2008/05/26 22:48:15 eva Exp $
 
 inherit eutils gnome2
 
@@ -23,7 +23,7 @@ RDEPEND=">=dev-libs/glib-2.13
 		 >=x11-libs/libnotify-0.2.1
 		 x11-libs/libXau
 		 x11-apps/xdpyinfo
-		 >=gnome-base/control-center-2.15.4
+		 gnome-base/gnome-settings-daemon
 		 >=gnome-base/gconf-2
 		 tcpd? ( >=sys-apps/tcp-wrappers-7.6 )"
 DEPEND="${RDEPEND}