saving uncommitted changes in /etc prior to emerge run

diff --git a/.etckeeper b/.etckeeper
index d49ffce8fe2f8a9605ce835ba7869f783f254b81..61e88d64a2c36a937341b1939abb71c470179ca3 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -1950,6 +1950,7 @@ maybe chmod 0644 './xdg/autostart/user-dirs-update-gtk.desktop'
 maybe chmod 0644 './xdg/autostart/vino-server.desktop'
 maybe chmod 0644 './xdg/autostart/xfce4-settings-helper-autostart.desktop'
 maybe chmod 0644 './xdg/autostart/xfce4-tips-autostart.desktop'
+maybe chmod 0644 './xdg/autostart/xscreensaver.desktop'
 maybe chmod 0755 './xdg/menus'
 maybe chmod 0644 './xdg/menus/._cfg0000_xfce-applications.menu'
 maybe chmod 0755 './xdg/menus/applications-merged'
@@ -1966,6 +1967,7 @@ maybe chmod 0644 './xdg/user-dirs.conf'
 maybe chmod 0644 './xdg/user-dirs.defaults'
 maybe chmod 0755 './xdg/xfce4'
 maybe chmod 0644 './xdg/xfce4/._cfg0000_helpers.rc'
+maybe chmod 0644 './xdg/xfce4/._cfg0000_xinitrc'
 maybe chmod 0644 './xdg/xfce4/Xft.xrdb'
 maybe chmod 0644 './xdg/xfce4/helpers.rc'
 maybe chmod 0755 './xdg/xfce4/panel'
@@ -1973,6 +1975,7 @@ maybe chmod 0644 './xdg/xfce4/panel/default.xml'
 maybe chmod 0755 './xdg/xfce4/xfconf'
 maybe chmod 0755 './xdg/xfce4/xfconf/xfce-perchannel-xml'
 maybe chmod 0644 './xdg/xfce4/xfconf/xfce-perchannel-xml/._cfg0000_xfce4-keyboard-shortcuts.xml'
+maybe chmod 0644 './xdg/xfce4/xfconf/xfce-perchannel-xml/._cfg0000_xfce4-session.xml'
 maybe chmod 0644 './xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml'
 maybe chmod 0644 './xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml'
 maybe chmod 0644 './xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml'

diff --git a/X11/Sessions/Xfce b/X11/Sessions/Xfce
new file mode 120000 (symlink)
index 0000000..964c89f
--- /dev/null
+++ b/X11/Sessions/Xfce
@@ -0,0 +1 @@
+Xfce4
\ No newline at end of file

diff --git a/xdg/autostart/xscreensaver.desktop b/xdg/autostart/xscreensaver.desktop
new file mode 100644 (file)
index 0000000..0262815
--- /dev/null
+++ b/xdg/autostart/xscreensaver.desktop
@@ -0,0 +1,15 @@
+
+[Desktop Entry]
+Type=Application
+Name=Screensaver
+Name[de]=Bildschirmschoner
+Name[en_GB]=Screensaver
+Name[ru]=Заставка
+Comment=Launch screensaver and locker program
+Comment[de]=Bildschirmschoner und -sperre aufrufen
+Comment[en_GB]=Launch screensaver and locker program
+Comment[ru]=Запуск заставки и блокировка рабочего стола
+Icon=preferences-desktop-screensaver
+Exec=xscreensaver -no-splash
+TryExec=xscreensaver
+OnlyShowIn=XFCE;

diff --git a/xdg/xfce4/._cfg0000_xinitrc b/xdg/xfce4/._cfg0000_xinitrc
new file mode 100644 (file)
index 0000000..9d20e8c
--- /dev/null
+++ b/xdg/xfce4/._cfg0000_xinitrc
@@ -0,0 +1,192 @@
+#!/bin/sh
+
+# fix broken $UID on some system...
+if test "x$UID" = "x"; then
+  if test -x /usr/xpg4/bin/id; then
+    UID=`/usr/xpg4/bin/id -u`;
+  else
+    UID=`id -u`;
+  fi
+fi
+
+# set $XDG_MENU_PREFIX to "xfce-" so that "xfce-applications.menu" is picked
+# over "applications.menu" in all Xfce applications.
+if test "x$XDG_MENU_PREFIX" = "x"; then
+  XDG_MENU_PREFIX="xfce-"
+  export XDG_MENU_PREFIX
+fi
+
+# set DESKTOP_SESSION so that one can detect easily if an Xfce session is running
+if test "x$DESKTOP_SESSION" = "x"; then
+  DESKTOP_SESSION="xfce"
+  export DESKTOP_SESSION
+fi
+
+# $XDG_CONFIG_HOME defines the base directory relative to which user specific
+# configuration files should be stored. If $XDG_CONFIG_HOME is either not set
+# or empty, a default equal to $HOME/.config should be used.
+if test "x$XDG_CONFIG_HOME" = "x" ; then
+  XDG_CONFIG_HOME=$HOME/.config
+fi
+[ -d "$XDG_CONFIG_HOME" ] || mkdir "$XDG_CONFIG_HOME"
+
+# $XDG_CACHE_HOME defines the base directory relative to which user specific
+# non-essential data files should be stored. If $XDG_CACHE_HOME is either not
+# set or empty, a default equal to $HOME/.cache should be used.
+if test "x$XDG_CACHE_HOME" = "x" ; then
+  XDG_CACHE_HOME=$HOME/.cache
+fi
+[ -d "$XDG_CACHE_HOME" ] || mkdir "$XDG_CACHE_HOME"
+
+# set up XDG user directores.  see
+# http://freedesktop.org/wiki/Software/xdg-user-dirs
+if which xdg-user-dirs-update >/dev/null 2>&1; then
+    xdg-user-dirs-update
+fi
+
+# Modify libglade and glade environment variables so that
+# it will find the files installed by Xfce
+GLADE_CATALOG_PATH="$GLADE_CATALOG_PATH:/usr/share/glade3/catalogs"
+GLADE_PIXMAP_PATH="$GLADE_PIXMAP_PATH:/usr/lib64/glade3/modules"
+GLADE_MODULE_PATH="$GLADE_MODULE_PATH:/usr/share/glade3/pixmaps"
+export GLADE_CATALOG_PATH
+export GLADE_PIXMAP_PATH
+export GLADE_MODULE_PATH
+
+# For now, start with an empty list
+XRESOURCES=""
+
+# Has to go prior to merging Xft.xrdb, as its the "Defaults" file
+test -r "/etc/xdg/xfce4/Xft.xrdb" && XRESOURCES="$XRESOURCES /etc/xdg/xfce4/Xft.xrdb"
+test -r $HOME/.Xdefaults && XRESOURCES="$XRESOURCES $HOME/.Xdefaults"
+
+BASEDIR=$XDG_CONFIG_HOME/xfce4
+if test -r "$BASEDIR/Xft.xrdb"; then
+  XRESOURCES="$XRESOURCES $BASEDIR/Xft.xrdb"
+elif test -r "$XFCE4HOME/Xft.xrdb"; then
+  mkdir -p "$BASEDIR"
+  cp "$XFCE4HOME/Xft.xrdb" "$BASEDIR"/
+  XRESOURCES="$XRESOURCES $BASEDIR/Xft.xrdb"
+fi
+
+# merge in X cursor settings
+test -r "$BASEDIR/Xcursor.xrdb" && XRESOURCES="$XRESOURCES $BASEDIR/Xcursor.xrdb"
+
+# ~/.Xresources contains overrides to the above
+test -r "$HOME/.Xresources" && XRESOURCES="$XRESOURCES $HOME/.Xresources"
+
+# load all X resources (adds /dev/null to avoid an empty list that would hang the process)
+cat /dev/null $XRESOURCES | xrdb -nocpp -merge -
+
+# load local modmap
+test -r $HOME/.Xmodmap && xmodmap $HOME/.Xmodmap
+
+# run xfce4-session if installed
+if which xfce4-session >/dev/null 2>&1; then
+
+  # check if we start xfce4-session with ck-launch-session. this is only
+  # required for starting from a console, not a login manager
+  if test "x$XFCE4_SESSION_WITH_CK" = "x1"; then
+    if which ck-launch-session >/dev/null 2>&1; then
+      ck-launch-session xfce4-session
+    else
+      echo
+      echo "You have tried to start Xfce with consolekit support, but"
+      echo "ck-launch-session is not installed."
+      echo "Aborted startup..."
+      echo
+
+      exit 1
+    fi
+  else
+    # start xfce4-session normally
+    xfce4-session
+  fi
+
+  exit 0
+fi
+
+##################
+# IMPORTANT NOTE #
+##################
+
+# Everything below here ONLY gets executed if you are NOT using xfce4-session
+# (Xfce's session manager).  If you are using the session manager, everything
+# below is handled by it, and the code below is not executed at all.  If you're
+# not sure if you're using the session manager, type 'ps -e|grep xfce4-session'
+# in a terminal while Xfce is running.
+
+##################
+
+# Use dbus-launch if installed.
+if test x"$DBUS_SESSION_BUS_ADDRESS" = x""; then
+  if which dbus-launch >/dev/null 2>&1; then
+    eval `dbus-launch --sh-syntax --exit-with-session`
+    # some older versions of dbus don't export the var properly
+    export DBUS_SESSION_BUS_ADDRESS
+  else
+    echo "Could not find dbus-launch; Xfce will not work properly" >&2
+    fi
+fi
+
+# this is only necessary when running w/o xfce4-session
+xsetroot -solid black -cursor_name watch
+
+# or use old-fashioned startup script otherwise
+
+xfsettingsd &
+xfwm4 --daemon
+
+# start up stuff in $XDG_CONFIG_HOME/autostart/
+if test -d "$XDG_CONFIG_HOME/autostart"; then
+  for i in ${XDG_CONFIG_HOME}/autostart/*.desktop; do
+    grep -q -E "^Hidden=true" "$i" && continue
+    if grep -q -E "^OnlyShowIn=" "$i"; then
+      # need to test twice, as lack of the line entirely means we still run it
+      grep -E "^OnlyShowIn=" "$i" | grep -q 'XFCE;' || continue
+    fi
+    grep -E "^NotShowIn=" "$i" | grep -q 'XFCE;' && continue
+
+    # check for TryExec
+    trycmd=`grep -E "^TryExec=" "$i" | cut -d'=' -f2`
+    if test "$trycmd"; then
+      which "$trycmd" >/dev/null 2>&1 || continue
+    fi
+
+    cmd=`grep -E "^Exec=" "$i" | cut -d'=' -f2`
+    if test "$cmd" && which "$cmd" >/dev/null 2>&1; then
+      $cmd &
+    fi
+  done
+fi
+
+xfdesktop&
+orage &
+
+panel=`which xfce4-panel`
+case "x$panel" in
+       x|xno*)
+               ;;
+       *)
+               $panel
+               ret=$?
+               while test $ret -ne 0; do
+                       xmessage -center -file - -timeout 20 -title Error <<EOF
+A crash occured in the panel
+Please report this to the xfce4-dev@xfce.org list
+or on http://bugs.xfce.org
+Meanwhile the panel will be restarted
+EOF
+                       cat >&2 <<EOF
+A crash occured in the panel
+Please report this to the xfce4-dev@xfce.org list
+or on http://bugs.xfce.org
+Meanwhile the panel will be restarted
+EOF
+                       $panel
+                       ret=$?
+               done
+               ;;
+esac
+
+xsetroot -bg white -fg red  -solid black -cursor_name watch

diff --git a/xdg/xfce4/xfconf/xfce-perchannel-xml/._cfg0000_xfce4-session.xml b/xdg/xfce4/xfconf/xfce-perchannel-xml/._cfg0000_xfce4-session.xml
new file mode 100644 (file)
index 0000000..a200a37
--- /dev/null
+++ b/xdg/xfce4/xfconf/xfce-perchannel-xml/._cfg0000_xfce4-session.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<channel name="xfce4-session" version="1.0">
+  <property name="general" type="empty">
+    <property name="FailsafeSessionName" type="string" value="Failsafe"/>
+  </property>
+  <property name="sessions" type="empty">
+    <property name="Failsafe" type="empty">
+      <property name="IsFailsafe" type="bool" value="true"/>
+      <property name="Count" type="int" value="5"/>
+      <property name="Client0_Command" type="array">
+        <value type="string" value="xfwm4"/>
+      </property>
+      <property name="Client0_PerScreen" type="bool" value="false"/>
+      <property name="Client1_Command" type="array">
+        <value type="string" value="xfsettingsd"/>
+      </property>
+      <property name="Client1_PerScreen" type="bool" value="false"/>
+      <property name="Client2_Command" type="array">
+        <value type="string" value="xfce4-panel"/>
+      </property>
+      <property name="Client2_PerScreen" type="bool" value="false"/>
+      <property name="Client3_Command" type="array">
+        <value type="string" value="Thunar"/>
+        <value type="string" value="--daemon"/>
+      </property>
+      <property name="Client3_PerScreen" type="bool" value="false"/>
+      <property name="Client4_Command" type="array">
+        <value type="string" value="xfdesktop"/>
+      </property>
+      <property name="Client4_PerScreen" type="bool" value="false"/>
+    </property>
+  </property>
+  <property name="splash" type="empty">
+    <property name="Engine" type="string" value=""/>
+  </property>
+</channel>