New version, removed older versions

8 files changed, 70 insertions, 74 deletions

diff --git a/gnome-base/gnome-session/ChangeLog b/gnome-base/gnome-session/ChangeLog
index 625aee1c3009..eb2b7ca11969 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-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/ChangeLog,v 1.81 2004/11/12 03:51:44 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/ChangeLog,v 1.82 2004/11/25 04:28:22 obz Exp $
+
+*gnome-session-2.8.1 (25 Nov 2004)
+
+  25 Nov 2004; Mike Gardiner <obz@gentoo.org>
+  +files/gnome-session-2.8.1-hide_splash.patch, -gnome-session-2.6.0.ebuild,
+  -gnome-session-2.6.1.ebuild, +gnome-session-2.8.1.ebuild:
+  New version, removed older versions, and updated the hide_splash
+  patch.
 
   12 Nov 2004; Gustavo Zacarias <gustavoz@gentoo.org>
   gnome-session-2.8.0.ebuild:
diff --git a/gnome-base/gnome-session/Manifest b/gnome-base/gnome-session/Manifest
index d8318b88e27f..c0060950d61f 100644
--- a/gnome-base/gnome-session/Manifest
+++ b/gnome-base/gnome-session/Manifest
@@ -1,19 +1,22 @@
-MD5 fb6acf7acb4e8f42eb956a6bb643f32f ChangeLog 10554
-MD5 a016b8df4641fc6486e374124922b784 gnome-session-2.4.2.ebuild 1314
-MD5 6fede0a1766b4660dde4632d1b01ca3f gnome-session-2.6.0.ebuild 1357
-MD5 1a40398023ec2fe024110e31a72fa1b0 gnome-session-2.6.1.ebuild 1364
+MD5 2e601a63c1c3042c686410686d8fdf7e gnome-session-2.8.1.ebuild 1413
 MD5 039c4a6bac3bdbfc0246fa3e60279073 gnome-session-2.6.2.ebuild 1363
-MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 0e073b743477cc1de8b9a04781bca8e5 gnome-session-2.8.0.ebuild 1542
+MD5 1a40398023ec2fe024110e31a72fa1b0 gnome-session-2.6.1.ebuild 1364
+MD5 a016b8df4641fc6486e374124922b784 gnome-session-2.4.2.ebuild 1314
+MD5 d09e67b7ccc722c9f1caa92a428be8f1 .gnome-session-2.8.1.ebuild.swp 12288
+MD5 fb6acf7acb4e8f42eb956a6bb643f32f ChangeLog 10554
+MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 6fede0a1766b4660dde4632d1b01ca3f gnome-session-2.6.0.ebuild 1357
 MD5 b10dbd1b6388f5fdf9feee0e56525ea5 files/Gnome 2464
+MD5 f02a80d3f1435547a479312c15cc1030 files/gnome-splash.png 78064
 MD5 c7dd76860a26aa54145fafa215e0aa42 files/digest-gnome-session-2.4.2 72
 MD5 2491d6c88bbbdc63af18a9b01a0c5a0e files/digest-gnome-session-2.6.0 72
 MD5 ff0c34f7b3b38e54e77cccfed76a230d files/digest-gnome-session-2.6.1 72
 MD5 d71ad6bbed92ba29fddd9c12be898740 files/digest-gnome-session-2.6.2 72
-MD5 f02a80d3f1435547a479312c15cc1030 files/gentoo-splash.png 78064
-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 f02a80d3f1435547a479312c15cc1030 files/gnome-splash.png 78064
 MD5 70b59c75e8a1ccc5b3d88f594082a4c3 files/digest-gnome-session-2.8.0 72
+MD5 3a73b51368c53cc714ffc2e7ba6b3d05 files/digest-gnome-session-2.8.1 72
 MD5 9ef946bc879dec308dc85b43f1e6b29f files/gnome-session-2-hide_splash.patch 1584
+MD5 9c41a7c69837eba927f8d546d3c13b8d files/gnome-session-2.6-schema_defaults.patch 1484
+MD5 f02a80d3f1435547a479312c15cc1030 files/gentoo-splash.png 78064
+MD5 9b6a487176c392343b5ce7eab34297af files/gnome-session-2.4-defaults.patch 1004
+MD5 73b0d3a312160d827670731c38f3f2ce files/gnome-session-2.0.9-64bit.patch 889
diff --git a/gnome-base/gnome-session/files/digest-gnome-session-2.6.0 b/gnome-base/gnome-session/files/digest-gnome-session-2.6.0
deleted file mode 100644
index 4ea9e1f026be..000000000000
--- a/gnome-base/gnome-session/files/digest-gnome-session-2.6.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 42018f3e5f201a4f449de444c600ce29 gnome-session-2.6.0.tar.bz2 836172
diff --git a/gnome-base/gnome-session/files/digest-gnome-session-2.6.1 b/gnome-base/gnome-session/files/digest-gnome-session-2.6.1
deleted file mode 100644
index 04437f449136..000000000000
--- a/gnome-base/gnome-session/files/digest-gnome-session-2.6.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 215ae74b1ba94b320e5791dfdfc44572 gnome-session-2.6.1.tar.bz2 863210
diff --git a/gnome-base/gnome-session/files/digest-gnome-session-2.8.1 b/gnome-base/gnome-session/files/digest-gnome-session-2.8.1
new file mode 100644
index 000000000000..2751d3dceeb6
--- /dev/null
+++ b/gnome-base/gnome-session/files/digest-gnome-session-2.8.1
@@ -0,0 +1 @@
+MD5 15402d84eef4cf159bb8de78f432bb98 gnome-session-2.8.1.tar.bz2 883921
diff --git a/gnome-base/gnome-session/files/gnome-session-2.8.1-hide_splash.patch b/gnome-base/gnome-session/files/gnome-session-2.8.1-hide_splash.patch
new file mode 100644
index 000000000000..f321961d8100
--- /dev/null
+++ b/gnome-base/gnome-session/files/gnome-session-2.8.1-hide_splash.patch
@@ -0,0 +1,40 @@
+diff -ur gnome-session-2.8.1/gnome-session/manager.c gnome-session-2.8.1-splashhide/gnome-session/manager.c
+--- gnome-session-2.8.1/gnome-session/manager.c	2004-10-01 18:13:23.000000000 +0800
++++ gnome-session-2.8.1-splashhide/gnome-session/manager.c	2004-11-25 12:19:03.377269296 +0800
+@@ -1380,8 +1380,10 @@
+ 	      if (pending_list)
+ 		runlevel = client->priority;
+ 	    }
+-	  if (pending_list)
++	  if (pending_list) {
++	    splash_hide();
+ 	    goto out;
++	  }
+ 	}
+       save_state = MANAGER_IDLE;
+       save_state_changed ();
+diff -ur gnome-session-2.8.1/gnome-session/splash-widget.c gnome-session-2.8.1-splashhide/gnome-session/splash-widget.c
+--- gnome-session-2.8.1/gnome-session/splash-widget.c	2004-09-25 00:35:38.000000000 +0800
++++ gnome-session-2.8.1-splashhide/gnome-session/splash-widget.c	2004-11-25 12:17:34.346803984 +0800
+@@ -605,3 +605,11 @@
+ 	}
+ }
+ 
++void
++splash_hide (void)
++{
++	if(global_splash) {
++		gtk_widget_hide (GTK_WIDGET (global_splash));
++	}
++}
++
+diff -ur gnome-session-2.8.1/gnome-session/splash-widget.h gnome-session-2.8.1-splashhide/gnome-session/splash-widget.h
+--- gnome-session-2.8.1/gnome-session/splash-widget.h	2003-02-14 06:29:57.000000000 +0800
++++ gnome-session-2.8.1-splashhide/gnome-session/splash-widget.h	2004-11-25 12:16:49.267657056 +0800
+@@ -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 */
diff --git a/gnome-base/gnome-session/gnome-session-2.6.1.ebuild b/gnome-base/gnome-session/gnome-session-2.6.1.ebuild
deleted file mode 100644
index 24c0dd252c65..000000000000
--- a/gnome-base/gnome-session/gnome-session-2.6.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2004 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.1.ebuild,v 1.4 2004/06/24 21:58:41 agriffis 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.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
-
-}
diff --git a/gnome-base/gnome-session/gnome-session-2.6.0.ebuild b/gnome-base/gnome-session/gnome-session-2.8.1.ebuild
index 4353747ecca2..5b563449ff08 100644
--- a/gnome-base/gnome-session/gnome-session-2.6.0.ebuild
+++ b/gnome-base/gnome-session/gnome-session-2.8.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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.0.ebuild,v 1.9 2004/07/04 12:30:37 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/gnome-session-2.8.1.ebuild,v 1.1 2004/11/25 04:28:22 obz Exp $
 
 inherit gnome2 eutils
 
@@ -10,7 +10,7 @@ LICENSE="GPL-2 LGPL-2 FDL-1.1"
 
 IUSE="ipv6"
 SLOT="0"
-KEYWORDS="x86 ppc alpha ~sparc hppa amd64 ~ia64 mips"
+KEYWORDS="~x86 ~ppc ~alpha ~sparc ~hppa ~amd64 ~ia64 ~mips ~ppc64"
 
 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"
 
@@ -41,6 +41,10 @@ src_unpack() {
 	# patch to set the Gentoo splash by default in the gconf key (#42687)
 	epatch ${FILESDIR}/${PN}-2.6-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}/${P}-hide_splash.patch
+
 }
 
 src_install() {