Added session handling, bug #303661.

Package-Manager: portage-2.1.7.17/cvs/Linux x86_64

3 files changed, 113 insertions, 3 deletions

diff --git a/x11-wm/awesome/ChangeLog b/x11-wm/awesome/ChangeLog
index 874d417e16a4..9e043a89a8e9 100644
--- a/x11-wm/awesome/ChangeLog
+++ b/x11-wm/awesome/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-wm/awesome
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/ChangeLog,v 1.92 2010/01/23 03:14:15 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/ChangeLog,v 1.93 2010/02/10 10:47:07 matsuu Exp $
+
+  10 Feb 2010; MATSUU Takuto <matsuu@gentoo.org> files/awesome-session:
+  Added session handling, bug #303661.
 
   23 Jan 2010; MATSUU Takuto <matsuu@gentoo.org> -awesome-2.3.4.ebuild,
   -awesome-3.2.1-r3.ebuild, -awesome-3.4.1.ebuild, -awesome-3.4.2.ebuild:
diff --git a/x11-wm/awesome/Manifest b/x11-wm/awesome/Manifest
index 23992460964f..11d41b56082d 100644
--- a/x11-wm/awesome/Manifest
+++ b/x11-wm/awesome/Manifest
@@ -1,5 +1,8 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX awesome-3.4.2-backtrace.patch 713 RMD160 b60e09f17c1452588020738df6657768080f4dcc SHA1 2845c4529f9189bf41ecd1c2df7eae36fbec329a SHA256 5738944681ce666fab1621c0abbb444356456fcea3ea2119f732c54ef4bf3f26
-AUX awesome-session 33 RMD160 68a828295285a5232603df6574fdffa2527fb183 SHA1 c30cf121e89f0fc7320b79ca3452c33ec516f38d SHA256 a76cca201d3f815658acfb54a9ff3737d263cae1f6cc3527a59b0f22aa01df1b
+AUX awesome-session 1999 RMD160 2a92c71209f81ecaa302e03974b2f44e380abf38 SHA1 8d86595e00759508a5f20f54dab46d2c143c5033 SHA256 bee150a5b32a118c905ffe26df3f776f40a2db19230f6600cc2966b6c727838a
 AUX awesome.desktop 150 RMD160 a50c71cfbcb9ee4b86da8cca19cbd876b3a7f9b0 SHA1 8314ccbed775ecb0af5107cec56632dbec1fe3cf SHA256 433f5cf4adea408e38d464af8b6259efd39a909735679f4625c0cb7fcab3337b
 DIST awesome-2.3.6.tar.gz 232212 RMD160 c4a097026bff49a6a0ac65af13818958c3365bde SHA1 ccc70f810617b6fecc256296f1a3d75a59c5de61 SHA256 14a38b6482d50f75a796a24a47e04089ae51b4046de622ce323783637bb61b50
 DIST awesome-3.3.4.tar.bz2 252231 RMD160 5891ec98d213ab2a8fef167d58bfb611f8bae61c SHA1 d97875d23eebe7c03839d37af3bb4597abdb4aa8 SHA256 f13628643c01eba26ae28b37be5abbfab1a3578eec8ff9031ed2d3ca170b8b18
@@ -7,5 +10,22 @@ DIST awesome-3.4.3.tar.bz2 271355 RMD160 b91c8e1a7aac4342547496a993d5d6338811e8a
 EBUILD awesome-2.3.6.ebuild 1314 RMD160 146b6e6e947c3fbd4f7532b4dab4773109515e39 SHA1 71d687ce6bd3c202e8dbc2943e993f1220ad1944 SHA256 ea8313dc1cbe8c10fd1b02c67be30f624b54b1d69cd8c974057826db6e26d032
 EBUILD awesome-3.3.4.ebuild 2136 RMD160 2cba0039c60b580a472a1ad057120fe160553fd0 SHA1 81a8d5be0d5aac25438803b4a4abab6ccfebaec7 SHA256 dd9e7ca2d793dbea3fb559013bd2c0e0a6dcb50e44e63547bb89512763aa8169
 EBUILD awesome-3.4.3.ebuild 2014 RMD160 3ea14840adfed4c8792eacf2baef770445fc744c SHA1 fec87da951b17dcdd7bf49a6e41a94f18eb03070 SHA256 42d4a7460fd6b02dbd21d21be78c2803e141c420e48eb7da45c6d9a96166d8d4
-MISC ChangeLog 13715 RMD160 74b144efd64ea05963270225d93749d67be04c8a SHA1 cf758ba542d6076419c1e236dbeea08b1cd19f9c SHA256 f3b5411c35afbcc5fb650becbee098529977c7f3eec0455063f5a3f9b81bf20b
+MISC ChangeLog 13827 RMD160 4a1833aa2e19d7eb69582ca4fff7950531dc84be SHA1 1bd8d44f438b72f493bce7550755f207e5b39af4 SHA256 25ee7b3ef1b86ba14bd4b6e11c998e0adecb0da1dfd0999e7263bd56361f7341
 MISC metadata.xml 248 RMD160 ade4235c4b35539d6cccd6005afba23a7c9d2afd SHA1 e6af7cb4622744522ecc176d800015b77cd75d81 SHA256 5d0b7e035a2cb76eeb00ece66b18b59060068ea76dd196e6cd4f4524c92cde17
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iQIcBAEBAgAGBQJLco65AAoJECaGw+YFKA1pz2AQAKW1Elz/vONZA1zlXsq7JCXo
+fWrNsaVUoixBDpJ13xoGKUseyNr03FAWDn58dPG6Uj28HlAPCHachjm9OlOEnuoW
+TgkytVIsDQvx03RjaxMvm1Be60z5Mktoe0WBwekh7FMHjPbO8F1iFLzV/hqBCDJS
+h1JKSLCZLCi6w+EUdF6ElyyUOVVk1J9vPPTdrPVi8cysUXPCWqyAlQslk3ppeDTr
+K1DO1cY2CjFuWm83+r/amH9dDGRIJJH8y1EUtSg1ncGtaUouaMEmGj7EMR3EZkJ6
+YpWyJL4+NM3hCbnwArUL84Bdc76igvGo+9UEYzmDe7hkskPjNv8qwb2Svd+QysZK
+PcZUeGR6kBSvsLhOoKxe/ezxmmL1sb/fETJkgYvORsYYgIVkh/9Kt2B2tRoJ1yoG
+nKWo7nX/Hxrn1HzowPcQiJrPxi4smyEhvuCXa5JfUOtJ8w2NweJogw7d+mUmQlQr
+CyLYoo048GykBf/r0ElAxHFgJWr2EmA9eL/2cEgJYC29I/1jdueiY/mOb+bTOvDL
+tMCoTdMLeMxdhZe4ouq4O5Q9dyOszjQO5pghJrJ8AqgR2kslwqWcGYdQQgrFqTzC
+PsUM8fW2VOgToxxSiBG73leUxLEosW8YWIFVh1YWzIvvN6+SE0384Bo1ozNmfFyP
+sFrqfmy2ksn0R3V3dQgj
+=RcMU
+-----END PGP SIGNATURE-----
diff --git a/x11-wm/awesome/files/awesome-session b/x11-wm/awesome/files/awesome-session
index cc832e16f5ca..fe7694671850 100644
--- a/x11-wm/awesome/files/awesome-session
+++ b/x11-wm/awesome/files/awesome-session
@@ -1,3 +1,90 @@
 #!/bin/sh
+# Awesome Xsession starter, based on Xsession shipped by x11-apps/xinit-1.0.5-r1
+
+# redirect errors to a file in user's home directory if we can
+for errfile in "$HOME/.awesome-errors" "${TMPDIR-/tmp}/awesome-$USER" "/tmp/awesome-$USER"
+do
+	if ( cp /dev/null "$errfile" 2> /dev/null )
+	then
+		chmod 600 "$errfile"
+		exec > "$errfile" 2>&1
+		break
+	fi
+done
+
+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 
+
+
+# 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" -a ! -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 /etc/X11/xorg.conf`
+       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 /usr/bin/awesome