new version, supporting new session scheme

4 files changed, 118 insertions, 9 deletions

diff --git a/gnome-base/gnome-core/files/Gnome b/gnome-base/gnome-core/files/Gnome
new file mode 100644
index 000000000000..55c0d72cc606
--- /dev/null
+++ b/gnome-base/gnome-core/files/Gnome
@@ -0,0 +1,109 @@
+#!/bin/sh
+
+for errfile in "$HOME/.gnomerc-errors" "${TMPDIR-/tmp}/gnomerc-$USER" "/tmp/gnomerc-$USER"
+do
+	if ( cp /dev/null "$errfile" 2> /dev/null )
+	then
+		chmod 600 "$errfile"
+		exec > "$errfile" 2>&1
+		break
+	fi
+done
+
+#
+#  Distributors:
+#  You should modify the paths here to fit your distro
+#  If you need to do so, send me (jirka@5z.com) a patch
+#  and I'll try to make the script detect the distro stuff
+#
+
+userresources=$HOME/.Xresources 
+usermodmap=$HOME/.Xmodmap 
+userxkbmap=$HOME/.Xkbmap
+
+sysresources=/etc/X11/Xresources 
+sysmodmap=/etc/X11/Xmodmap 
+sysxkbmap=/etc/X11/Xkbmap
+
+rh6sysresources=/etc/X11/xinit/Xresources 
+rh6sysmodmap=/etc/X11/xinit/Xmodmap 
+
+if [ -x "$HOME/.gnomerc" ]; then
+	command="$HOME/.gnomerc"
+elif [ -x /etc/X11/gdm/gnomerc ]; then
+	command="/etc/X11/gdm/gnomerc"
+else
+	# as fallback in case the config is screwed
+	command=`which gnome-session`
+fi
+
+sshagent=`which ssh-agent`
+if [ -n "$sshagent" ] && [ -x "$sshagent" ] && [ -z "$SSH_AUTH_SOCK" ]; then
+    command="$sshagent -- $command"
+fi
+
+# merge in defaults
+if [ -f "$rh6sysresources" ]; then
+    xrdb -merge "$rh6sysresources"
+fi
+
+if [ -f "$sysresources" ]; then
+    xrdb -merge "$sysresources"
+fi
+
+if [ -f "$userresources" ]; then
+    xrdb -merge "$userresources"
+fi
+
+# merge in keymaps
+if [ -f "$sysxkbmap" ]; then
+    setxkbmap `cat "$sysxkbmap"`
+    XKB_IN_USE=yes
+fi
+
+if [ -f "$userxkbmap" ]; then
+    setxkbmap `cat "$userxkbmap"`
+    XKB_IN_USE=yes
+fi
+
+#
+# Eeek, this seems like too much magic here
+#
+if [ -z "$XKB_IN_USE" ] && [ ! -L /etc/X11/X ]; then
+    if grep '^exec.*/Xsun' /etc/X11/X > /dev/null 2>&1 && [ -f /etc/X11/XF86Config ]; then
+       xkbsymbols=`sed -n -e 's/^[     ]*XkbSymbols[   ]*"\(.*\)".*$/\1/p' /etc/X11/XF86Config`
+       if [ -n "$xkbsymbols" ]; then
+           setxkbmap -symbols "$xkbsymbols"
+           XKB_IN_USE=yes
+       fi
+    fi
+fi
+
+# xkb and xmodmap don't play nice together
+if [ -z "$XKB_IN_USE" ]; then
+    if [ -f "$rh6sysmodmap" ]; then
+       xmodmap "$rh6sysmodmap"
+    fi
+
+    if [ -f "$sysmodmap" ]; then
+       xmodmap "$sysmodmap"
+    fi
+
+    if [ -f "$usermodmap" ]; then
+       xmodmap "$usermodmap"
+    fi
+fi
+
+unset XKB_IN_USE
+
+# run all system xinitrc shell scripts.
+if [ -d /etc/X11/xinit/xinitrc.d ]; then
+    for i in /etc/X11/xinit/xinitrc.d/* ; do
+        if [ -x "$i" ]; then
+	    . "$i"
+        fi
+    done
+fi
+
+exec $command
+
diff --git a/gnome-base/gnome-core/files/digest-gnome-core-1.4.0.4-r3 b/gnome-base/gnome-core/files/digest-gnome-core-1.4.0.4-r3
deleted file mode 100644
index 03dabf95cebe..000000000000
--- a/gnome-base/gnome-core/files/digest-gnome-core-1.4.0.4-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5225e6afa09f2396136af247b3d022ad gnome-core-1.4.0.4.tar.gz 6787072
diff --git a/gnome-base/gnome-core/files/digest-gnome-core-1.4.0.6 b/gnome-base/gnome-core/files/digest-gnome-core-1.4.0.6
new file mode 100644
index 000000000000..cdb00cef82c7
--- /dev/null
+++ b/gnome-base/gnome-core/files/digest-gnome-core-1.4.0.6
@@ -0,0 +1 @@
+MD5 bc0cad00493d6f256d2434399d9dfc15 gnome-core-1.4.0.6.tar.gz 7708672
diff --git a/gnome-base/gnome-core/gnome-core-1.4.0.4-r3.ebuild b/gnome-base/gnome-core/gnome-core-1.4.0.6.ebuild
index c3dfc5195bb7..2aa1b6375201 100644
--- a/gnome-base/gnome-core/gnome-core-1.4.0.4-r3.ebuild
+++ b/gnome-base/gnome-core/gnome-core-1.4.0.6.ebuild
@@ -1,11 +1,12 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-core/gnome-core-1.4.0.4-r3.ebuild,v 1.1 2001/10/29 18:34:41 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-core/gnome-core-1.4.0.6.ebuild,v 1.1 2002/01/27 13:43:31 azarah Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="gnome-core"
-SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${P}.tar.gz"
+SRC_URI="ftp://ftp.yggdrasil.com/mirrors/site/ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${P}.tar.gz
+	ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${P}.tar.gz"
 HOMEPAGE="http://www.gnome.org/"
 
 RDEPEND=">=gnome-base/control-center-1.4.0.1-r1
@@ -13,7 +14,7 @@ RDEPEND=">=gnome-base/control-center-1.4.0.1-r1
 	 >=gnome-base/gnome-libs-1.4.1.2-r1"
 
 DEPEND="${RDEPEND}
-        nls? ( sys-devel/gettext )
+        sys-devel/gettext
         >=sys-apps/tcp-wrappers-7.6
         >=app-text/scrollkeeper-0.2
 	>=dev-util/intltool-0.11"
@@ -22,11 +23,6 @@ src_compile() {
 	local myconf
 	local myldflags
 
-	if [ -z "`use nls`" ]
-	then
-		myconf="--disable-nls"
-	fi
-
 	if [ "`use kde`" ]
 	then
 		myconf="${myconf} --with-kde-datadir=/usr/share"
@@ -50,5 +46,9 @@ src_install() {
   	     localstatedir=${D}/var/lib					\
 	     install || die
 
+	# Support for new X session management scheme
+	exeinto /etc/X11/Sessions
+	doexe ${FILESDIR}/Gnome
+
 	dodoc AUTHORS COPYING* ChangeLog README NEWS
 }