New revision, 2.10.0-r1, with a modified patch for gconf schemas. See bug #95745. Removing obsolete ebuilds/files.

(Portage version: 2.0.51.22-r1)

14 files changed, 36 insertions, 237 deletions

diff --git a/gnome-base/gnome-session/ChangeLog b/gnome-base/gnome-session/ChangeLog
index ad6deff507eb..9458925639c5 100644
--- a/gnome-base/gnome-session/ChangeLog
+++ b/gnome-base/gnome-session/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnome-base/gnome-session
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/ChangeLog,v 1.95 2005/06/13 06:00:08 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/ChangeLog,v 1.96 2005/06/17 00:33:38 leonardop Exp $
+
+*gnome-session-2.10.0-r1 (16 Jun 2005)
+
+  16 Jun 2005; Leonardo Boshell <leonardop@gentoo.org>
+  gnome-session-2.10.0-r1.ebuild,
+  files/gnome-session-2.10.0-schema_defaults.patch:
+  New revision with a modified patch concerning the default gconf schemas.
+  Resolves bug #95745.
 
   13 Jun 2005; Markus Rothe <corsair@gentoo.org>
   gnome-session-2.10.0.ebuild:
diff --git a/gnome-base/gnome-session/Manifest b/gnome-base/gnome-session/Manifest
index 591a03bd74d7..ed0ddca2a7df 100644
--- a/gnome-base/gnome-session/Manifest
+++ b/gnome-base/gnome-session/Manifest
@@ -1,20 +1,13 @@
 MD5 4a0746793b11cc16cccff841e4ff318b ChangeLog 12209
-MD5 83f24762bbd25b6828aa7ca32cc4e800 gnome-session-2.4.2.ebuild 1312
-MD5 99a7fb3933117e9549c9c7dd90c0ceb1 gnome-session-2.6.2.ebuild 1363
-MD5 a296d97782aadce09cdecb58dc7bcbb2 gnome-session-2.8.0.ebuild 1539
+MD5 9c2572b8b87f1eecee9984e6e3e526d2 gnome-session-2.10.0-r1.ebuild 1561
 MD5 e4982d9876770455de51c227911b039c gnome-session-2.8.1.ebuild 1515
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 9366baa83428e1c4e3e3af844e049205 gnome-session-2.10.0.ebuild 1527
 MD5 b10dbd1b6388f5fdf9feee0e56525ea5 files/Gnome 2464
-MD5 cb41214e255018ea0c78074aeafd0177 files/digest-gnome-session-2.10.0 73
-MD5 c7dd76860a26aa54145fafa215e0aa42 files/digest-gnome-session-2.4.2 72
-MD5 d71ad6bbed92ba29fddd9c12be898740 files/digest-gnome-session-2.6.2 72
-MD5 70b59c75e8a1ccc5b3d88f594082a4c3 files/digest-gnome-session-2.8.0 72
+MD5 1472ffe4555c4aab66d8359a4031544d files/gnome-session-2.10.0-schema_defaults.patch 648
+MD5 cb41214e255018ea0c78074aeafd0177 files/digest-gnome-session-2.10.0-r1 73
 MD5 3a73b51368c53cc714ffc2e7ba6b3d05 files/digest-gnome-session-2.8.1 72
 MD5 f02a80d3f1435547a479312c15cc1030 files/gentoo-splash.png 78064
-MD5 9ef946bc879dec308dc85b43f1e6b29f files/gnome-session-2-hide_splash.patch 1584
-MD5 73b0d3a312160d827670731c38f3f2ce files/gnome-session-2.0.9-64bit.patch 889
-MD5 9b6a487176c392343b5ce7eab34297af files/gnome-session-2.4-defaults.patch 1004
 MD5 9c41a7c69837eba927f8d546d3c13b8d files/gnome-session-2.6-schema_defaults.patch 1484
 MD5 b6e2c49cdafa0d5d8fe9ab4e28f5fc3d files/gnome-session-2.8.1-hide_splash.patch 1469
-MD5 f02a80d3f1435547a479312c15cc1030 files/gnome-splash.png 78064
+MD5 cb41214e255018ea0c78074aeafd0177 files/digest-gnome-session-2.10.0 73
diff --git a/gnome-base/gnome-session/files/digest-gnome-session-2.10.0-r1 b/gnome-base/gnome-session/files/digest-gnome-session-2.10.0-r1
new file mode 100644
index 000000000000..697d6f1d9467
--- /dev/null
+++ b/gnome-base/gnome-session/files/digest-gnome-session-2.10.0-r1
@@ -0,0 +1 @@
+MD5 cbeb2db49dac11bf8088e6b025265fff gnome-session-2.10.0.tar.bz2 796754
diff --git a/gnome-base/gnome-session/files/digest-gnome-session-2.4.2 b/gnome-base/gnome-session/files/digest-gnome-session-2.4.2
deleted file mode 100644
index 40835eb4c1d3..000000000000
--- a/gnome-base/gnome-session/files/digest-gnome-session-2.4.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 fc2e6d9c71b4d1fe08ec329d7e03684e gnome-session-2.4.2.tar.bz2 911570
diff --git a/gnome-base/gnome-session/files/digest-gnome-session-2.6.2 b/gnome-base/gnome-session/files/digest-gnome-session-2.6.2
deleted file mode 100644
index f2f0c97a8fda..000000000000
--- a/gnome-base/gnome-session/files/digest-gnome-session-2.6.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0c80fbb64123cef7f2d7a9b69b0b965e gnome-session-2.6.2.tar.bz2 873420
diff --git a/gnome-base/gnome-session/files/digest-gnome-session-2.8.0 b/gnome-base/gnome-session/files/digest-gnome-session-2.8.0
deleted file mode 100644
index 42dce1f5dafb..000000000000
--- a/gnome-base/gnome-session/files/digest-gnome-session-2.8.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4287f6aada952623a5d6f512cbf212d1 gnome-session-2.8.0.tar.bz2 868871
diff --git a/gnome-base/gnome-session/files/gnome-session-2-hide_splash.patch b/gnome-base/gnome-session/files/gnome-session-2-hide_splash.patch
deleted file mode 100644
index ebf6bef683dd..000000000000
--- a/gnome-base/gnome-session/files/gnome-session-2-hide_splash.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-Index: gnome-session/splash-widget.h
-===================================================================
-RCS file: /cvs/gnome/gnome-session/gnome-session/splash-widget.h,v
-retrieving revision 1.5
-diff -u -r1.5 splash-widget.h
---- gnome-session/splash-widget.h	13 Feb 2003 22:29:57 -0000	1.5
-+++ gnome-session/splash-widget.h	16 Jul 2004 04:17:00 -0000
-@@ -79,5 +79,6 @@
- void splash_start  (void);
- void splash_update (const gchar *text);
- void splash_stop   (void);
-+void splash_hide   (void);
- 
- #endif /* SPLASH_WIDGET_H */
-Index: gnome-session/splash-widget.c
-===================================================================
-RCS file: /cvs/gnome/gnome-session/gnome-session/splash-widget.c,v
-retrieving revision 1.12
-diff -u -r1.12 splash-widget.c
---- gnome-session/splash-widget.c	14 Jun 2004 13:06:06 -0000	1.12
-+++ gnome-session/splash-widget.c	16 Jul 2004 04:17:08 -0000
-@@ -600,3 +600,11 @@
- 	}
- }
- 
-+void
-+splash_hide (void)
-+{
-+	if (global_splash) {
-+		gtk_widget_hide (GTK_WIDGET (global_splash));
-+	}
-+}
-+
-Index: gnome-session/manager.c
-===================================================================
-RCS file: /cvs/gnome/gnome-session/gnome-session/manager.c,v
-retrieving revision 1.78
-diff -u -r1.78 manager.c
---- gnome-session/manager.c	25 Feb 2003 08:50:09 -0000	1.78
-+++ gnome-session/manager.c	16 Jul 2004 04:17:32 -0000
-@@ -1165,8 +1165,10 @@
- 	      if (pending_list)
- 		runlevel = client->priority;
- 	    }
--	  if (pending_list)
-+	  if (pending_list) {
-+	    splash_hide();
- 	    return;
-+	  }
- 	}
-       save_state = MANAGER_IDLE;
-       splash_stop ();
diff --git a/gnome-base/gnome-session/files/gnome-session-2.0.9-64bit.patch b/gnome-base/gnome-session/files/gnome-session-2.0.9-64bit.patch
deleted file mode 100644
index fb778fab9b43..000000000000
--- a/gnome-base/gnome-session/files/gnome-session-2.0.9-64bit.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- gnome-session-2.0.9/gnome-session/gsm-client-editor.c	2002-05-22 15:43:54.000000000 -0400
-+++ gnome-session-2.0.9/gnome-session/gsm-client-editor.c.new	2003-02-06 16:10:05.000000000 -0500
-@@ -68,10 +68,10 @@
-   (GtkClassInitFunc) NULL
- };
- 
--guint
-+GtkType
- gsm_client_editor_get_type (void)
- {
--  static guint type = 0;
-+  static GtkType type = 0;
- 
-   if (!type)
-     type = gtk_type_unique (gtk_hbox_get_type (), &gsm_client_editor_info);
---- gnome-session-2.0.9/gnome-session/gsm-client-editor.h	1999-03-18 10:11:50.000000000 -0500
-+++ gnome-session-2.0.9/gnome-session/gsm-client-editor.h.new	2003-02-06 16:09:56.000000000 -0500
-@@ -47,7 +47,7 @@
- 		    guint order, GsmStyle style);    /* user change */
- };
- 
--guint gsm_client_editor_get_type  (void);
-+GtkType gsm_client_editor_get_type (void);
- 
- /* Creates a client_editor widget */
- GtkWidget* gsm_client_editor_new (void);
diff --git a/gnome-base/gnome-session/files/gnome-session-2.10.0-schema_defaults.patch b/gnome-base/gnome-session/files/gnome-session-2.10.0-schema_defaults.patch
new file mode 100644
index 000000000000..e9e3df8da74e
--- /dev/null
+++ b/gnome-base/gnome-session/files/gnome-session-2.10.0-schema_defaults.patch
@@ -0,0 +1,11 @@
+--- gnome-session-2.5.92/gnome-session/gnome-session.schemas.in	2003-11-12 11:30:57.000000000 +0100
++++ gnome-session-2.5.92/gnome-session/gnome-session.schemas.in.patched	2004-03-20 09:59:55.497898160 +0100
+@@ -50,7 +50,7 @@
+          <applyto>/apps/gnome-session/options/splash_image</applyto>
+          <owner>gnome</owner>
+          <type>string</type>
+-         <default>splash/gnome-splash.png</default>
++         <default>splash/gentoo-splash.png</default>
+          <locale name="C">
+             <short>Splash Screen Image</short>
+             <long>Preferred Image to use for the splash screen when logging in to the GNOME Desktop</long>
diff --git a/gnome-base/gnome-session/files/gnome-session-2.4-defaults.patch b/gnome-base/gnome-session/files/gnome-session-2.4-defaults.patch
deleted file mode 100644
index 54a18c9156d8..000000000000
--- a/gnome-base/gnome-session/files/gnome-session-2.4-defaults.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- gnome-session/gnome-session.schemas.in.in.old	2003-10-05 18:16:07.735960136 +0800
-+++ gnome-session/gnome-session.schemas.in.in	2003-10-05 18:16:31.372366856 +0800
-@@ -17,7 +17,7 @@
-          <applyto>/apps/gnome-session/options/auto_save_session</applyto>
-          <owner>gnome</owner>
-          <type>bool</type>
--         <default>false</default>
-+         <default>true</default>
-          <locale name="C">
-             <short>Save sessions</short>
-             <long>If enabled, gnome-session will save the session automatically.  Otherwise, the logout dialog will have an option to save the session.</long>
-@@ -28,7 +28,7 @@
-          <applyto>/apps/gnome-session/options/logout_prompt</applyto>
-          <owner>gnome</owner>
-          <type>bool</type>
--         <default>true</default>
-+         <default>false</default>
-          <locale name="C">
-             <short>Logout prompt</short>
-             <long>If enabled, gnome-session will prompt the user before ending a session.</long>
diff --git a/gnome-base/gnome-session/files/gnome-splash.png b/gnome-base/gnome-session/files/gnome-splash.png
deleted file mode 100644
index 2b0a737e247e..000000000000
--- a/gnome-base/gnome-session/files/gnome-splash.png
+++ /dev/null
diff --git a/gnome-base/gnome-session/gnome-session-2.8.0.ebuild b/gnome-base/gnome-session/gnome-session-2.10.0-r1.ebuild
index 9e221aec0763..84db872802e1 100644
--- a/gnome-base/gnome-session/gnome-session-2.8.0.ebuild
+++ b/gnome-base/gnome-session/gnome-session-2.10.0-r1.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2005 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.8.0.ebuild,v 1.7 2005/01/08 23:22:19 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/gnome-session-2.10.0-r1.ebuild,v 1.1 2005/06/17 00:33:38 leonardop Exp $
 
-inherit gnome2 eutils
+inherit eutils gnome2
 
 DESCRIPTION="Gnome session manager"
 HOMEPAGE="http://www.gnome.org/"
-LICENSE="GPL-2 LGPL-2 FDL-1.1"
 
-IUSE="ipv6"
+LICENSE="GPL-2 LGPL-2 FDL-1.1"
 SLOT="0"
-KEYWORDS="x86 ppc alpha sparc ~hppa ~amd64 ~ia64 ~mips ~ppc64"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="ipv6"
 
 RDEPEND=">=x11-libs/gtk+-2.3.1
 	>=media-sound/esound-0.2.26
@@ -28,7 +28,7 @@ DEPEND="${RDEPEND}
 
 G2CONF="${G2CONF} $(use_enable ipv6)"
 
-DOCS="AUTHORS ChangeLog COPYING* HACKING INSTALL NEWS README"
+DOCS="AUTHORS ChangeLog HACKING NEWS README"
 
 USE_DESTDIR="1"
 
@@ -37,13 +37,14 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 
-	# patch for logout dialog, see bug # 30230 and dups
-	# patch to set the Gentoo splash by default in the gconf key (#42687)
-	epatch ${FILESDIR}/${PN}-2.6-schema_defaults.patch
+	# Patch for logout dialog and automatic session save now reverted. See bug
+	# #95745. Patch to set the Gentoo splash by default in the gconf key
+	# (#42687)
+	epatch ${FILESDIR}/${P}-schema_defaults.patch
 
 	# Hide the splash after defaults have been loaded, a temp workaround
 	# for http://bugzilla.gnome.org/show_bug.cgi?id=116814
-	epatch ${FILESDIR}/${PN}-2-hide_splash.patch
+	epatch ${FILESDIR}/${PN}-2.8.1-hide_splash.patch
 
 }
 
diff --git a/gnome-base/gnome-session/gnome-session-2.4.2.ebuild b/gnome-base/gnome-session/gnome-session-2.4.2.ebuild
deleted file mode 100644
index a88c02be527f..000000000000
--- a/gnome-base/gnome-session/gnome-session-2.4.2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2005 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.4.2.ebuild,v 1.13 2005/01/08 23:22:19 slarti Exp $
-
-inherit gnome2 eutils
-
-DESCRIPTION="Gnome session manager"
-HOMEPAGE="http://www.gnome.org/"
-LICENSE="GPL-2 LGPL-2 FDL-1.1"
-
-IUSE="ipv6"
-SLOT="0"
-KEYWORDS="x86 ppc alpha sparc hppa amd64 ia64 mips"
-
-RDEPEND=">=x11-libs/gtk+-2.2
-	>=media-sound/esound-0.2.26
-	>=gnome-base/libgnomeui-2.2
-	>=sys-apps/tcp-wrappers-7.6
-	>=gnome-base/gconf-2"
-
-DEPEND="${RDEPEND}
-	>=sys-devel/gettext-0.10.40
-	>=dev-util/pkgconfig-0.12.0
-	>=dev-util/intltool-0.22
-	!gnome-base/gnome-core
-	dev-perl/XML-Parser"
-# gnome-base/gnome-core overwrites /usr/bin/gnome-session
-
-DOCS="AUTHORS ChangeLog COPYING* HACKING INSTALL NEWS README"
-
-G2CONF="${G2CONF} $(use_enable ipv6)"
-
-src_unpack() {
-
-	unpack ${A}
-	cd ${S}
-
-	# patch for logout dialog, see bug # 30230 and dups
-	epatch ${FILESDIR}/${PN}-2.4-defaults.patch
-
-}
-
-src_install() {
-
-	gnome2_src_install
-
-	dodir /etc/X11/Sessions
-	exeinto /etc/X11/Sessions
-	doexe ${FILESDIR}/Gnome
-
-	# Our own splash for world domination
-	# FIXME : in an ideal world we would alter the gconf key
-	insinto /usr/share/pixmaps/splash/
-	doins ${FILESDIR}/gnome-splash.png
-
-}
diff --git a/gnome-base/gnome-session/gnome-session-2.6.2.ebuild b/gnome-base/gnome-session/gnome-session-2.6.2.ebuild
deleted file mode 100644
index 8da9d2844a82..000000000000
--- a/gnome-base/gnome-session/gnome-session-2.6.2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2005 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.6.2.ebuild,v 1.9 2005/01/08 23:22:19 slarti Exp $
-
-inherit gnome2 eutils
-
-DESCRIPTION="Gnome session manager"
-HOMEPAGE="http://www.gnome.org/"
-LICENSE="GPL-2 LGPL-2 FDL-1.1"
-
-IUSE="ipv6"
-SLOT="0"
-KEYWORDS="x86 ~ppc alpha sparc hppa amd64 ~ia64 mips ppc64"
-
-RDEPEND=">=x11-libs/gtk+-2.3.1
-	>=media-sound/esound-0.2.26
-	>=gnome-base/libgnomeui-2.2
-	>=sys-apps/tcp-wrappers-7.6
-	>=gnome-base/gconf-2
-	gnome-base/gnome-keyring"
-
-DEPEND="${RDEPEND}
-	>=sys-devel/gettext-0.10.40
-	>=dev-util/pkgconfig-0.12.0
-	>=dev-util/intltool-0.29
-	!gnome-base/gnome-core"
-# gnome-base/gnome-core overwrite /usr/bin/gnome-session
-
-G2CONF="${G2CONF} $(use_enable ipv6)"
-
-DOCS="AUTHORS ChangeLog COPYING* HACKING INSTALL NEWS README"
-
-USE_DESTDIR="1"
-
-src_unpack() {
-
-	unpack ${A}
-	cd ${S}
-
-	# patch for logout dialog, see bug # 30230 and dups
-	# patch to set the Gentoo splash by default in the gconf key (#42687)
-	epatch ${FILESDIR}/${PN}-2.6-schema_defaults.patch
-
-}
-
-src_install() {
-
-	gnome2_src_install
-
-	dodir /etc/X11/Sessions
-	exeinto /etc/X11/Sessions
-	doexe ${FILESDIR}/Gnome
-
-	# Our own splash for world domination
-	insinto /usr/share/pixmaps/splash/
-	doins ${FILESDIR}/gentoo-splash.png
-
-}