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

(Portage version: 2.1.5)

3 files changed, 10 insertions, 72 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/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}