committing changes in /etc after emerge run

Package changes:
+gnome-base/gnome-session-2.32.1-r3

diff --git a/.etckeeper b/.etckeeper
index 784dbcad2e4e4a2fe6a3c8628e32de7030bef0a4..040b35c55c6e36d9a0b401111f229be2b115264e 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -69,6 +69,7 @@ maybe chmod 0755 './UPower'
 maybe chmod 0644 './UPower/UPower.conf'
 maybe chmod 0755 './X11'
 maybe chmod 0755 './X11/Sessions'
+maybe chmod 0755 './X11/Sessions/Gnome'
 maybe chmod 0755 './X11/Sessions/Xfce4'
 maybe chmod 0755 './X11/Sessions/Xsession'
 maybe chmod 0755 './X11/Sessions/fvwm'
@@ -93,8 +94,10 @@ maybe chmod 0755 './X11/xinit'
 maybe chmod 0644 './X11/xinit/xinitrc'
 maybe chmod 0755 './X11/xinit/xinitrc.d'
 maybe chmod 0755 './X11/xinit/xinitrc.d/00-xhost'
+maybe chmod 0755 './X11/xinit/xinitrc.d/10-user-dirs-update-gnome'
 maybe chmod 0755 './X11/xinit/xinitrc.d/10-xdg-menu-gnome'
 maybe chmod 0755 './X11/xinit/xinitrc.d/11-xdg-menu-kde-4'
+maybe chmod 0755 './X11/xinit/xinitrc.d/15-xdg-data-gnome'
 maybe chmod 0755 './X11/xinit/xinitrc.d/70-seahorse-agent'
 maybe chmod 0755 './X11/xinit/xinitrc.d/80-dbus'
 maybe chmod 0755 './X11/xinit/xinitrc.d/90-consolekit'
@@ -634,6 +637,7 @@ maybe chmod 0644 './gconf/schemas/gnobots2.schemas'
 maybe chmod 0644 './gconf/schemas/gnome-dictionary.schemas'
 maybe chmod 0644 './gconf/schemas/gnome-screenshot.schemas'
 maybe chmod 0644 './gconf/schemas/gnome-search-tool.schemas'
+maybe chmod 0644 './gconf/schemas/gnome-session.schemas'
 maybe chmod 0644 './gconf/schemas/gnome-settings-daemon.schemas'
 maybe chmod 0644 './gconf/schemas/gnome-sudoku.schemas'
 maybe chmod 0644 './gconf/schemas/gnome-system-log.schemas'

diff --git a/X11/Sessions/Gnome b/X11/Sessions/Gnome
new file mode 100755 (executable)
index 0000000..55d39b6
--- /dev/null
+++ b/X11/Sessions/Gnome
@@ -0,0 +1,109 @@
+#!/bin/sh
+#
+# This file has bitrotted badly. Someone needs to clean this up.
+#
+
+if [ -f /etc/xdg/menus/gnome-applications.menu ] ; then
+       export XDG_MENU_PREFIX=gnome-
+fi
+
+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
+
+# 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/X11/xinit/xinitrc.d/10-user-dirs-update-gnome b/X11/xinit/xinitrc.d/10-user-dirs-update-gnome
new file mode 100755 (executable)
index 0000000..f909d44
--- /dev/null
+++ b/X11/xinit/xinitrc.d/10-user-dirs-update-gnome
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+# Create various XDG directories, and write ~/.config/user-dirs.dirs, etc.
+# That file is read by glib to get XDG_PICTURES_DIR, etc
+
+if [ "$DESKTOP_SESSION" = "gnome" ]; then
+       if type xdg-user-dirs-update &>/dev/null; then
+               xdg-user-dirs-update
+       fi
+fi

diff --git a/X11/xinit/xinitrc.d/15-xdg-data-gnome b/X11/xinit/xinitrc.d/15-xdg-data-gnome
new file mode 100755 (executable)
index 0000000..e62f3e1
--- /dev/null
+++ b/X11/xinit/xinitrc.d/15-xdg-data-gnome
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+if [ "$DESKTOP_SESSION" = "gnome" ]; then
+       if [ -z "$XDG_DATA_DIRS" ]; then
+               export XDG_DATA_DIRS=/usr/share/gnome:/usr/local/share/:/usr/share/
+       else
+               export XDG_DATA_DIRS=/usr/share/gnome:"$XDG_DATA_DIRS"
+       fi
+fi

diff --git a/gconf/schemas/gnome-session.schemas b/gconf/schemas/gnome-session.schemas
new file mode 100644 (file)
index 0000000..d506e48
--- /dev/null
+++ b/gconf/schemas/gnome-session.schemas
@@ -0,0 +1,261 @@
+<?xml version="1.0"?>
+<gconfschemafile>
+   <schemalist>
+
+      <schema>
+         <key>/schemas/apps/gnome-session/options/auto_save_session</key>
+         <applyto>/apps/gnome-session/options/auto_save_session</applyto>
+         <owner>gnome</owner>
+         <type>bool</type>
+         <default>false</default>
+         <locale name="C">
+            <short>Save sessions</short>
+            <long>If enabled, gnome-session will save the session automatically.</long>
+         </locale>
+
+         <locale name="de">
+            <short>Sitzungen speichern</short>
+            <long>Falls aktiviert, speichert gnome-session die Sitzung automatisch.</long>
+         </locale>
+
+         <locale name="en_GB">
+            <short>Save sessions</short>
+            <long>If enabled, gnome-session will save the session automatically.</long>
+         </locale>
+
+         <locale name="ru">
+            <short>Сохранять сеансы</short>
+            <long>Если этот ключ установлен, gnome-session будет автоматически сохранять сеанс.</long>
+         </locale>
+
+         <locale name="vi">
+            <short>Lưu các phiên chạy</short>
+            
+         </locale>
+      </schema>
+      <schema>
+         <key>/schemas/apps/gnome-session/options/logout_prompt</key>
+         <applyto>/apps/gnome-session/options/logout_prompt</applyto>
+         <owner>gnome</owner>
+         <type>bool</type>
+         <default>true</default>
+         <locale name="C">
+            <short>Logout prompt</short>
+            <long>If enabled, gnome-session will prompt the user before ending a session.</long>
+         </locale>
+
+         <locale name="de">
+            <short>Abmeldedialog</short>
+            <long>Soll gnome-session den Benutzer vor dem Beenden einer Sitzung fragen?</long>
+         </locale>
+
+         <locale name="en_GB">
+            <short>Logout prompt</short>
+            <long>If enabled, gnome-session will prompt the user before ending a session.</long>
+         </locale>
+
+         <locale name="ru">
+            <short>Запрос при выходе из сеанса</short>
+            <long>Если этот ключ установлен, gnome-session будет спрашивать пользователя перед окончанием сеанса.</long>
+         </locale>
+
+         <locale name="vi">
+            <short>Nhắc đăng xuất</short>
+            <long>Nếu bật, gnome-session sẽ nhắc người dùng trước khi kết thúc phiên chạy.</long>
+         </locale>
+      </schema>
+      <schema>
+        <key>/schemas/desktop/gnome/session/idle_delay</key>
+        <applyto>/desktop/gnome/session/idle_delay</applyto>
+        <owner>gnome</owner>
+        <type>int</type>
+        <default>5</default>
+        <locale name="C">
+          <short>Time before session is considered idle</short>
+          <long>
+            The number of minutes of inactivity before the session is
+            considered idle.
+          </long>
+        </locale>
+
+        <locale name="de">
+          <short>Zeitdauer ab der die Sitzung als untätig gilt</short>
+          <long>Die Anzahl inaktiver Minuten bis der Benutzer als untätig gilt.</long>
+        </locale>
+
+        <locale name="en_GB">
+          <short>Time before session is considered idle</short>
+          <long>The number of minutes of inactivity before the session is considered idle.</long>
+        </locale>
+
+        <locale name="ru">
+          <short>Промежуток времени, по истечении которого сеанс будет считаться неактивным</short>
+          <long>Промежуток времени в минутах, по истечении которого сеанс будет считаться неактивным.</long>
+        </locale>
+
+        <locale name="vi">
+          <short>Khoảng thời gian trước khi phiên chạy được thấy là « nghỉ »</short>
+          <long>Số các phút không hoạt động trước khi phiên chạy được thấy là « nghỉ ».</long>
+        </locale>
+      </schema>
+      <schema>
+         <key>/schemas/desktop/gnome/session/default_session</key>
+         <applyto>/desktop/gnome/session/default_session</applyto>
+         <owner>gnome</owner>
+         <type>list</type>
+         <list_type>string</list_type>
+         <default>[gnome-settings-daemon]</default>
+         <!-- FIXME when not string frozen: mention that required components are added to the default session -->
+         <locale name="C">
+            <short>Default session</short>
+            <long>List of applications that are part of the default session.</long>
+         </locale>
+
+         <locale name="de">
+            <short>Standardsitzung</short>
+            <long>Liste der Anwendungen, die Teil der Standardsitzung sind.</long>
+         </locale>
+
+         <locale name="en_GB">
+            <short>Default session</short>
+            <long>List of applications that are part of the default session.</long>
+         </locale>
+
+         <locale name="ru">
+            <short>Сеанс по умолчанию</short>
+            <long>Список приложений, являющихся частью сеанса по умолчанию.</long>
+         </locale>
+
+         <locale name="vi">
+            <short>Phiên chạy mặc định</short>
+            <long>Danh sách các ứng dụng thuộc về phiên chạy mặc định.</long>
+         </locale>
+      </schema>
+      <schema>
+         <key>/schemas/desktop/gnome/session/required_components_list</key>
+         <applyto>/desktop/gnome/session/required_components_list</applyto>
+         <owner>gnome</owner>
+         <type>list</type>
+         <list_type>string</list_type>
+         <default>[windowmanager,panel,filemanager]</default>
+         <locale name="C">
+            <short>Required session components</short>
+            <long>List of components that are required as part of the session. (Each element names a key under "/desktop/gnome/session/required_components"). The Startup Applications preferences tool will not normally allow users to remove a required component from the session, and the session manager will automatically add the required components back to the session at login time if they do get removed.</long>
+         </locale>
+
+         <locale name="de">
+            <short>Benötigte Sitzungskomponenten</short>
+            <long>Liste der Komponenten, die als Teil der Sitzung erforderlich sind. (Jedes Element bezeichnet einen Schlüssel unter »/desktop/gnome/session/required_components«). Das Programm zur Verwaltung der Startprogrammeinstellungen erlaubt gewöhnlichen Benutzern nicht, benötigte Komponenten aus der Sitzung zu entfernen. Diese werden bei Anmeldung wieder automatisch zur Sitzung hinzugefügt, falls sie entfernt wurden.</long>
+         </locale>
+
+         <locale name="en_GB">
+            <short>Required session components</short>
+            <long>List of components that are required as part of the session. (Each element names a key under &quot;/desktop/gnome/session/required_components&quot;). The Startup Applications preferences tool will not normally allow users to remove a required component from the session, and the session manager will automatically add the required components back to the session at login time if they do get removed.</long>
+         </locale>
+
+         <locale name="ru">
+            <short>Требуемые компоненты сеанса</short>
+            <long>Список компонентов, которые требуются запустить как часть этого сеанса. (каждый элемент соответствует ключу в поддереве «/desktop/gnome/session/required-components»). Приложение «Параметры запускаемых приложений», как правило, не позволяет пользователю удалять из сеанса требуемые компоненты, и менеджер сеансов автоматически добавит требуемые компоненты, если они были удалены.</long>
+         </locale>
+
+         <locale name="vi">
+            <short>Thành phần phiên chạy đòi hỏi</short>
+            
+         </locale>
+      </schema>
+      <schema>
+         <key>/schemas/desktop/gnome/session/required_components/windowmanager</key>
+         <applyto>/desktop/gnome/session/required_components/windowmanager</applyto>
+         <owner>gnome</owner>
+         <type>string</type>
+         <default>gnome-wm</default>
+         <locale name="C">
+            <short>Window Manager</short>
+            <long>The window manager is the program that draws the title bar and borders around windows, and allows you to move and resize windows.</long>
+         </locale>
+
+         <locale name="de">
+            <short>Fenstermanager</short>
+            <long>Der Fenstermanager ist das Programm, welches die Titelleiste und die Ränder der Fenster zeichnet, sowie das Bewegen und die Änderung der Größe der Fenster erlaubt.</long>
+         </locale>
+
+         <locale name="en_GB">
+            <short>Window Manager</short>
+            <long>The window manager is the program that draws the title bar and borders around windows, and allows you to move and resize windows.</long>
+         </locale>
+
+         <locale name="ru">
+            <short>Менеджер окон</short>
+            <long>Менеджер окон - это программа, которая рисует заголовок и обрамление окна, и позволяет вам перемещать окна и менять их размер.</long>
+         </locale>
+
+         <locale name="vi">
+            <short>Bộ quản lý cửa sổ</short>
+            <long>Bộ quản lý cửa sổ là chương trình mà vẽ thanh tựa đề và các viền chung quanh cửa sổ, và cho phép bạn di chuyển và co giãn cửa sổ.</long>
+         </locale>
+      </schema>
+      <schema>
+         <key>/schemas/desktop/gnome/session/required_components/panel</key>
+         <applyto>/desktop/gnome/session/required_components/panel</applyto>
+         <owner>gnome</owner>
+         <type>string</type>
+         <default>gnome-panel</default>
+         <locale name="C">
+            <short>Panel</short>
+            <long>The panel provides the bar at the top or bottom of the screen containing menus, the window list, status icons, the clock, etc.</long>
+         </locale>
+
+         <locale name="de">
+            <short>Das Panel</short>
+            <long>Das Panel stellt die Leisten am oberen und unteren Bildschirmrand bereit, welche die Menüs, die Fensterliste, Statussymbole, die Uhr usw. beinhalten.</long>
+         </locale>
+
+         <locale name="en_GB">
+            <short>Panel</short>
+            <long>The panel provides the bar at the top or bottom of the screen containing menus, the window list, status icons, the clock, etc.</long>
+         </locale>
+
+         <locale name="ru">
+            <short>Панель</short>
+            <long>Панель предоставляет собой полосу вверху или внизу экрана, содержащую меню, список окон, значки состояния, часы и т.д.</long>
+         </locale>
+
+         <locale name="vi">
+            <short>Bảng</short>
+            <long>Bảng điều khiển cung cấp thanh ở đầu/cưới màn hình mà chứa các trình đơn, danh sách các cửa sổ, các biểu tượng trạng thái, đồng hồ v.v.</long>
+         </locale>
+      </schema>
+      <schema>
+         <key>/schemas/desktop/gnome/session/required_components/filemanager</key>
+         <applyto>/desktop/gnome/session/required_components/filemanager</applyto>
+         <owner>gnome</owner>
+         <type>string</type>
+         <default>nautilus</default>
+         <locale name="C">
+            <short>File Manager</short>
+            <long>The file manager provides the desktop icons and allows you to interact with your saved files.</long>
+         </locale>
+
+         <locale name="de">
+            <short>Dateimanager</short>
+            <long>Der Dateimanager stellt die Desktop-Symbole bereit und erlaubt Ihnen, gespeicherte Dateien zu verwalten.</long>
+         </locale>
+
+         <locale name="en_GB">
+            <short>File Manager</short>
+            <long>The file manager provides the desktop icons and allows you to interact with your saved files.</long>
+         </locale>
+
+         <locale name="ru">
+            <short>Менеджер файлов</short>
+            <long>Менеджер файлов предоставляет значки рабочего стола и позволяет работать с сохранёнными файлами.</long>
+         </locale>
+
+         <locale name="vi">
+            <short>Bộ Quản lý Tập tin</short>
+            <long>Bộ quản lý tập tin thì cung cấp các biểu tượng trên màn hình và cho phép bạn tương tác với các tập tin đã lưu của mình.</long>
+         </locale>
+      </schema>
+
+   </schemalist>
+</gconfschemafile>