gnome 2.6 commit

9 files changed, 58 insertions, 75 deletions

diff --git a/gnome-base/gnome-session/ChangeLog b/gnome-base/gnome-session/ChangeLog
index bb23b46ae55e..e89770583f56 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-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/ChangeLog,v 1.60 2004/03/17 01:05:52 geoman Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/ChangeLog,v 1.61 2004/03/20 09:19:58 foser Exp $
+
+*gnome-session-2.5.92 (20 Mar 2004)
+
+  20 Mar 2004; foser <foser@gentoo.org> gnome-session.2.5.92.ebuild, gentoo-splash.png :
+  Gnome 2.6 commit
+  Add nicer solution for providing Gentoo splash, adapted from patch by Mason Kidd <mrkidd@mrkidd.com> in #42687
 
   16 Mar 2004; Stephen P. Becker <geoman@gentoo.org>
   gnome-session-2.4.2.ebuild:
diff --git a/gnome-base/gnome-session/Manifest b/gnome-base/gnome-session/Manifest
index 14f70c5df457..0af42bd1a7a9 100644
--- a/gnome-base/gnome-session/Manifest
+++ b/gnome-base/gnome-session/Manifest
@@ -1,12 +1,12 @@
-MD5 7cf501b202f26346d8f85a9d1f9e96ff gnome-session-2.4.1.ebuild 1289
-MD5 7a22cc8c7f4b59ade96842a87a5db4a3 gnome-session-2.4.0.ebuild 1464
 MD5 84de62e1a481f0f3f8c60e5d87f8f5f6 gnome-session-2.4.2.ebuild 1315
-MD5 296b55429e48249f0c9a89ffa32ec782 ChangeLog 8105
+MD5 e3529fb45d7d0138d3a775e8185249d8 ChangeLog 8363
+MD5 51bcd76a866746818b1f082793030eb4 gnome-session-2.5.92.ebuild 1365
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 b10dbd1b6388f5fdf9feee0e56525ea5 files/Gnome 2464
 MD5 f02a80d3f1435547a479312c15cc1030 files/gnome-splash.png 78064
-MD5 ebfde736b9aa58793476ac3dbf09fe23 files/digest-gnome-session-2.4.0 72
-MD5 4022794e99a461f04b831f82c4d823e8 files/digest-gnome-session-2.4.1 72
 MD5 c7dd76860a26aa54145fafa215e0aa42 files/digest-gnome-session-2.4.2 72
+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
+MD5 335ef4013ccb2f6c0d9de086a03dcde7 files/digest-gnome-session-2.5.92 73
diff --git a/gnome-base/gnome-session/files/digest-gnome-session-2.4.0 b/gnome-base/gnome-session/files/digest-gnome-session-2.4.0
deleted file mode 100644
index f8cbb3097021..000000000000
--- a/gnome-base/gnome-session/files/digest-gnome-session-2.4.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6a7acf3429b927c69e18019f9ec6fa9f gnome-session-2.4.0.tar.bz2 899580
diff --git a/gnome-base/gnome-session/files/digest-gnome-session-2.4.1 b/gnome-base/gnome-session/files/digest-gnome-session-2.4.1
deleted file mode 100644
index da2816426b3d..000000000000
--- a/gnome-base/gnome-session/files/digest-gnome-session-2.4.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 da92740dd8a7f316b2bc4a295fd94136 gnome-session-2.4.1.tar.bz2 902545
diff --git a/gnome-base/gnome-session/files/digest-gnome-session-2.5.92 b/gnome-base/gnome-session/files/digest-gnome-session-2.5.92
new file mode 100644
index 000000000000..0e61cd0d2eca
--- /dev/null
+++ b/gnome-base/gnome-session/files/digest-gnome-session-2.5.92
@@ -0,0 +1 @@
+MD5 1d1b4b0ea44bda439ace636f4b63908b gnome-session-2.5.92.tar.bz2 833733
diff --git a/gnome-base/gnome-session/files/gentoo-splash.png b/gnome-base/gnome-session/files/gentoo-splash.png
new file mode 100644
index 000000000000..2b0a737e247e
--- /dev/null
+++ b/gnome-base/gnome-session/files/gentoo-splash.png
diff --git a/gnome-base/gnome-session/files/gnome-session-2.6-schema_defaults.patch b/gnome-base/gnome-session/files/gnome-session-2.6-schema_defaults.patch
new file mode 100644
index 000000000000..55e7192ddfbf
--- /dev/null
+++ b/gnome-base/gnome-session/files/gnome-session-2.6-schema_defaults.patch
@@ -0,0 +1,29 @@
+--- 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
+@@ -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>
+@@ -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/gnome-session-2.4.0.ebuild b/gnome-base/gnome-session/gnome-session-2.4.0.ebuild
deleted file mode 100644
index b559ccaadada..000000000000
--- a/gnome-base/gnome-session/gnome-session-2.4.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/gnome-session-2.4.0.ebuild,v 1.11 2004/01/26 00:23:42 vapier Exp $
-
-inherit gnome2
-
-DESCRIPTION="Gnome session manager"
-HOMEPAGE="http://www.gnome.org/"
-
-IUSE="ipv6"
-SLOT="0"
-KEYWORDS="x86 ppc alpha sparc hppa amd64 ia64"
-LICENSE="GPL-2 LGPL-2 FDL-1.1"
-
-RDEPEND=">=x11-libs/gtk+-2.2
-	>=media-sound/esound-0.2.26
-	>=gnome-base/libgnomeui-2.2
-	>=sys-apps/tcp-wrappers-7.6"
-
-DEPEND="${RDEPEND}
-	>=sys-devel/gettext-0.10.40
-	>=dev-util/pkgconfig-0.12.0
-	>=dev-util/intltool-0.22
-	!gnome-base/gnome-core"
-# gnome-base/gnome-core overwrite /usr/bin/gnome-session
-
-DOCS="AUTHORS ChangeLog COPYING* HACKING NEWS README"
-
-G2CONF="${G2CONF} $(use_enable ipv6)"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# patch for logout dialog, see bug # 30230 and dups
-	epatch ${FILESDIR}/gnome-session-2.4-defaults.patch
-
-	# This patch is only necessary on 64-bit platforms such as Alpha
-	# but it doesn't hurt elsewhere.
-#	epatch ${FILESDIR}/${PN}-2.0.9-64bit.patch || die
-
-#	WANT_AUTOCONF=2.5 autoconf || die
-#	automake
-}
-
-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.4.1.ebuild b/gnome-base/gnome-session/gnome-session-2.5.92.ebuild
index f51481d0809f..bd38a8fae344 100644
--- a/gnome-base/gnome-session/gnome-session-2.4.1.ebuild
+++ b/gnome-base/gnome-session/gnome-session-2.5.92.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/gnome-session-2.4.1.ebuild,v 1.4 2004/01/29 05:05:57 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/gnome-session-2.5.92.ebuild,v 1.1 2004/03/20 09:19:58 foser Exp $
 
 inherit gnome2
 
@@ -10,35 +10,41 @@ LICENSE="GPL-2 LGPL-2 FDL-1.1"
 
 IUSE="ipv6"
 SLOT="0"
-KEYWORDS="x86 ~ppc alpha sparc hppa ~amd64 ia64"
+KEYWORDS="~x86 ~ppc ~alpha ~sparc ~hppa ~amd64 ~ia64 ~mips"
 
-RDEPEND=">=x11-libs/gtk+-2.2
+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/gconf-2
+	gnome-base/gnome-keyring"
 
 DEPEND="${RDEPEND}
 	>=sys-devel/gettext-0.10.40
 	>=dev-util/pkgconfig-0.12.0
-	>=dev-util/intltool-0.22
+	>=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"
 
-G2CONF="${G2CONF} $(use_enable ipv6)"
+USE_DESTDIR="1"
 
 src_unpack() {
+
 	unpack ${A}
 	cd ${S}
 
 	# patch for logout dialog, see bug # 30230 and dups
-	epatch ${FILESDIR}/${PN}-2.4-defaults.patch
+	# 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
@@ -46,7 +52,7 @@ src_install() {
 	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
+	insinto /usr/share/pixmaps/splash/
+	doins ${FILESDIR}/gentoo-splash.png
+
 }