saving uncommitted changes in /etc prior to emerge run

diff --git a/.etckeeper b/.etckeeper
index 5f68336dbf73e24e9783c398ffb88081092b02f7..fc548a0b71b8078758f83b4dced38ce72b59277b 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -1949,6 +1949,7 @@ maybe chmod 0644 './xdg/autostart/pulseaudio.desktop'
 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/xfsettingsd.desktop'
 maybe chmod 0644 './xdg/autostart/xscreensaver.desktop'
 maybe chmod 0755 './xdg/menus'
 maybe chmod 0644 './xdg/menus/._cfg0000_xfce-applications.menu'
@@ -1962,6 +1963,7 @@ maybe chmod 0644 './xdg/menus/kde-4-applications.menu'
 maybe chmod 0644 './xdg/menus/kde-information.menu'
 maybe chmod 0644 './xdg/menus/settings.menu'
 maybe chmod 0644 './xdg/menus/xfce-applications.menu'
+maybe chmod 0644 './xdg/menus/xfce-settings-manager.menu'
 maybe chmod 0644 './xdg/user-dirs.conf'
 maybe chmod 0644 './xdg/user-dirs.defaults'
 maybe chmod 0755 './xdg/xfce4'
@@ -1976,6 +1978,7 @@ 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/._cfg0000_xsettings.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/xdg/autostart/xfsettingsd.desktop b/xdg/autostart/xfsettingsd.desktop
new file mode 100644 (file)
index 0000000..3db7299
--- /dev/null
+++ b/xdg/autostart/xfsettingsd.desktop
@@ -0,0 +1,13 @@
+[Desktop Entry]
+Version=1.0
+Name=Xfsettingsd
+Comment=The Xfce Settings Daemon
+Comment[de]=Der Einstellungs-Daemon für Xfce
+Comment[en_GB]=The Xfce Settings Daemon
+Comment[ru]=Служба диспетчера настроек Xfce
+Exec=xfsettingsd
+Icon=applications-system
+Terminal=false
+Type=Application
+StartupNotify=false
+OnlyShowIn=XFCE;

diff --git a/xdg/menus/xfce-settings-manager.menu b/xdg/menus/xfce-settings-manager.menu
new file mode 100644 (file)
index 0000000..4c6e8c5
--- /dev/null
+++ b/xdg/menus/xfce-settings-manager.menu
@@ -0,0 +1,92 @@
+<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
+ "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd">
+
+<Menu>
+  <Name>Settings</Name>
+
+  <DefaultAppDirs/>
+  <DefaultDirectoryDirs/>
+  <DefaultMergeDirs/>
+
+   <Layout>
+     <Menuname>Personal</Menuname>
+     <Menuname>Hardware</Menuname>
+     <Menuname>System</Menuname>
+     <Menuname>Other</Menuname>
+     <Merge type="all" />
+   </Layout>
+
+  <Include>
+    <And>
+      <Category>Settings</Category>
+      <Not>
+        <Or>
+          <Category>X-XFCE-PersonalSettings</Category>
+          <Category>X-XFCE-HardwareSettings</Category>
+          <Category>X-XFCE-SystemSettings</Category>
+        </Or>
+      </Not>
+    </And>
+  </Include>
+
+  <Exclude>
+    <Filename>xfce-settings-manager.desktop</Filename>
+  </Exclude>
+
+  <Menu>
+    <Name>Personal</Name>
+    <Directory>xfce-personal.directory</Directory>
+    <Include>
+      <And>
+        <Category>Settings</Category>
+        <Category>X-XFCE-SettingsDialog</Category>
+        <Category>X-XFCE-PersonalSettings</Category>
+      </And>
+      <Filename>xscreensaver-properties.desktop</Filename>
+    </Include>
+  </Menu>
+
+  <Menu>
+    <Name>Hardware</Name>
+    <Directory>xfce-hardware.directory</Directory>
+    <Include>
+      <And>
+        <Category>Settings</Category>
+        <Category>X-XFCE-SettingsDialog</Category>
+        <Category>X-XFCE-HardwareSettings</Category>
+      </And>
+    </Include>
+  </Menu>
+
+  <Menu>
+    <Name>System</Name>
+    <Directory>xfce-system.directory</Directory>
+    <Include>
+      <And>
+        <Category>Settings</Category>
+        <Category>X-XFCE-SettingsDialog</Category>
+        <Category>X-XFCE-SystemSettings</Category>
+      </And>
+    </Include>
+  </Menu>
+
+  <Menu>
+    <Name>Other</Name>
+    <Directory>xfce-other.directory</Directory>
+    <Include>
+      <And>
+        <Category>Settings</Category>
+        <Category>X-XFCE-SettingsDialog</Category>
+        <Not>
+          <Or>
+            <Category>X-XFCE-PersonalSettings</Category>
+            <Category>X-XFCE-SystemSettings</Category>
+            <Category>X-XFCE-HardwareSettings</Category>
+            <Filename>xfce-settings-manager.desktop</Filename>
+          </Or>
+        </Not>
+      </And>
+    </Include>
+  </Menu>
+
+</Menu>

diff --git a/xdg/xfce4/xfconf/xfce-perchannel-xml/._cfg0000_xsettings.xml b/xdg/xfce4/xfconf/xfce-perchannel-xml/._cfg0000_xsettings.xml
new file mode 100644 (file)
index 0000000..8f9e2eb
--- /dev/null
+++ b/xdg/xfce4/xfconf/xfce-perchannel-xml/._cfg0000_xsettings.xml
@@ -0,0 +1,45 @@
+<!--
+  Default values for the X settings registry as described in
+  http://www.freedesktop.org/wiki/Specifications/XSettingsRegistry
+-->
+
+<?xml version="1.0" encoding="UTF-8"?>
+<channel name="xsettings" version="1.0">
+  <property name="Net" type="empty">
+    <property name="ThemeName" type="empty"/>
+    <property name="IconThemeName" type="empty"/>
+    <property name="DoubleClickTime" type="int" value="250"/>
+    <property name="DoubleClickDistance" type="int" value="5"/>
+    <property name="DndDragThreshold" type="int" value="8"/>
+    <property name="CursorBlink" type="bool" value="true"/>
+    <property name="CursorBlinkTime" type="int" value="1200"/>
+    <property name="SoundThemeName" type="string" value="default"/>
+    <property name="EnableEventSounds" type="bool" value="false"/>
+    <property name="EnableInputFeedbackSounds" type="bool" value="false"/>
+  </property>
+  <property name="Xft" type="empty">
+    <property name="DPI" type="empty"/>
+    <property name="Antialias" type="int" value="-1"/>
+    <property name="Hinting" type="int" value="-1"/>
+    <property name="HintStyle" type="string" value="hintnone"/>
+    <property name="RGBA" type="string" value="none"/>
+    <!-- <property name="Lcdfilter" type="string" value="none"/> -->
+  </property>
+  <property name="Gtk" type="empty">
+    <property name="CanChangeAccels" type="bool" value="false"/>
+    <property name="ColorPalette" type="string" value="black:white:gray50:red:purple:blue:light blue:green:yellow:orange:lavender:brown:goldenrod4:dodger blue:pink:light green:gray10:gray30:gray75:gray90"/>
+    <property name="FontName" type="string" value="Sans 10"/>
+    <property name="IconSizes" type="string" value=""/>
+    <property name="KeyThemeName" type="string" value=""/>
+    <property name="ToolbarStyle" type="string" value="icons"/>
+    <property name="ToolbarIconSize" type="int" value="3"/>
+    <property name="IMPreeditStyle" type="string" value=""/>
+    <property name="IMStatusStyle" type="string" value=""/>
+    <property name="MenuImages" type="bool" value="true"/>
+    <property name="ButtonImages" type="bool" value="true"/>
+    <property name="MenuBarAccel" type="string" value="F10"/>
+    <property name="CursorThemeName" type="string" value=""/>
+    <property name="CursorThemeSize" type="int" value="0"/>
+    <property name="IMModule" type="string" value=""/>
+  </property>
+</channel>