committing changes in /etc after emerge run

Package changes:
+gnome-base/gnome-menus-2.30.5

diff --git a/.etckeeper b/.etckeeper
index f8d9ded768a78e11005c6be0756f923d5291b78b..391fb40bb38af12c46cb2894ac95e794af17fb58 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -66,6 +66,7 @@ maybe chmod 0755 './X11/mwm'
 maybe chmod 0644 './X11/mwm/system.mwmrc'
 maybe chmod 0755 './X11/xinit'
 maybe chmod 0755 './X11/xinit/xinitrc.d'
+maybe chmod 0755 './X11/xinit/xinitrc.d/10-xdg-menu-gnome'
 maybe chmod 0755 './X11/xinit/xinitrc.d/80-dbus'
 maybe chmod 0755 './X11/xinit/xinitrc.d/90-consolekit'
 maybe chmod 0600 './aiccu.conf'
@@ -1116,6 +1117,9 @@ maybe chmod 0644 './xdg/autostart/gsettings-data-convert.desktop'
 maybe chmod 0644 './xdg/autostart/polkit-gnome-authentication-agent-1.desktop'
 maybe chmod 0644 './xdg/autostart/pulseaudio-kde.desktop'
 maybe chmod 0644 './xdg/autostart/pulseaudio.desktop'
+maybe chmod 0755 './xdg/menus'
+maybe chmod 0644 './xdg/menus/gnome-applications.menu'
+maybe chmod 0644 './xdg/menus/settings.menu'
 maybe chmod 0644 './xinetd.conf'
 maybe chmod 0755 './xinetd.d'
 maybe chmod 0644 './xinetd.d/chargen-dgram'

diff --git a/X11/xinit/xinitrc.d/10-xdg-menu-gnome b/X11/xinit/xinitrc.d/10-xdg-menu-gnome
new file mode 100755 (executable)
index 0000000..b12a712
--- /dev/null
+++ b/X11/xinit/xinitrc.d/10-xdg-menu-gnome
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+if [ -z "$XDG_MENU_PREFIX" ] && [ "$DESKTOP_SESSION" = "gnome" ]
+then
+       export XDG_MENU_PREFIX=gnome-
+fi

diff --git a/xdg/menus/gnome-applications.menu b/xdg/menus/gnome-applications.menu
new file mode 100644 (file)
index 0000000..ec48619
--- /dev/null
+++ b/xdg/menus/gnome-applications.menu
@@ -0,0 +1,167 @@
+<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
+ "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd">
+
+<Menu>
+
+  <Name>Applications</Name>
+  <Directory>X-GNOME-Menu-Applications.directory</Directory>
+
+  <!-- Scan legacy dirs first, as later items take priority -->
+  <KDELegacyDirs/>
+  <LegacyDir>/etc/X11/applnk</LegacyDir>
+  <LegacyDir>/usr/share/gnome/apps</LegacyDir>
+
+  <!-- Read standard .directory and .desktop file locations -->
+  <DefaultAppDirs/>
+  <DefaultDirectoryDirs/>
+
+  <!-- Read in overrides and child menus from applications-merged/ -->
+  <DefaultMergeDirs/>
+
+  <!-- Accessories submenu -->
+  <Menu>
+    <Name>Accessories</Name>
+    <Directory>Utility.directory</Directory>
+    <Include>
+      <And>
+        <Category>Utility</Category>
+       <!-- Accessibility spec must have either the Utility or Settings
+            category, and we display an accessibility submenu already for
+            the ones that do not have Settings, so don't display accessibility
+            applications here -->
+        <Not><Category>Accessibility</Category></Not>
+        <Not><Category>System</Category></Not>
+      </And>
+    </Include>
+  </Menu> <!-- End Accessories -->
+
+  <!-- Accessibility submenu -->
+  <Menu>
+    <Name>Universal Access</Name>
+    <Directory>Utility-Accessibility.directory</Directory>
+    <Include>
+      <And>
+        <Category>Accessibility</Category>
+        <Not><Category>Settings</Category></Not>
+      </And>
+    </Include>
+  </Menu> <!-- End Accessibility -->
+
+  <!-- Development Tools -->
+  <Menu>
+    <Name>Development</Name>
+    <Directory>Development.directory</Directory>
+    <Include>
+      <And>
+        <Category>Development</Category>
+      </And>
+      <Filename>emacs.desktop</Filename>
+    </Include>
+  </Menu> <!-- End Development Tools -->
+
+  <!-- Education -->
+  <Menu>
+    <Name>Education</Name>
+    <Directory>Education.directory</Directory>
+    <Include>
+      <And>
+        <Category>Education</Category>
+      </And>
+    </Include>
+  </Menu> <!-- End Education -->
+
+  <!-- Games -->
+  <Menu>
+    <Name>Games</Name>
+    <Directory>Game.directory</Directory>
+    <Include>
+      <And>
+        <Category>Game</Category>
+      </And>
+    </Include>
+  </Menu> <!-- End Games -->
+
+  <!-- Graphics -->
+  <Menu>
+    <Name>Graphics</Name>
+    <Directory>Graphics.directory</Directory>
+    <Include>
+      <And>
+        <Category>Graphics</Category>
+      </And>
+    </Include>
+  </Menu> <!-- End Graphics -->
+
+  <!-- Internet -->
+  <Menu>
+    <Name>Internet</Name>
+    <Directory>Network.directory</Directory>
+    <Include>
+      <And>
+        <Category>Network</Category>
+      </And>
+    </Include>
+  </Menu>   <!-- End Internet -->
+
+  <!-- Multimedia -->
+  <Menu>
+    <Name>Multimedia</Name>
+    <Directory>AudioVideo.directory</Directory>
+    <Include>
+      <And>
+        <Category>AudioVideo</Category>
+      </And>
+    </Include>
+  </Menu>   <!-- End Multimedia -->
+
+  <!-- Office -->
+  <Menu>
+    <Name>Office</Name>
+    <Directory>Office.directory</Directory>
+    <Include>
+      <And>
+        <Category>Office</Category>
+      </And>
+    </Include>
+  </Menu> <!-- End Office -->
+
+  <!-- System Tools-->
+  <Menu>
+    <Name>System</Name>
+    <Directory>System-Tools.directory</Directory>
+    <Include>
+      <And>
+        <Category>System</Category>
+        <Not><Category>Settings</Category></Not>
+      </And>
+    </Include>
+  </Menu>   <!-- End System Tools -->
+
+  <!-- Other -->
+  <Menu>
+    <Name>Other</Name>
+    <Directory>X-GNOME-Other.directory</Directory>
+    <OnlyUnallocated/>
+    <Include>
+      <And>
+        <Not><Category>Core</Category></Not>
+        <Not><Category>Settings</Category></Not>
+        <Not><Category>Screensaver</Category></Not>
+        <Not><Category>X-KDE-settings-accessibility</Category></Not>
+        <Not><Category>X-KDE-settings-components</Category></Not>
+        <Not><Category>X-KDE-settings-desktop</Category></Not>
+        <Not><Category>X-KDE-settings-looknfeel</Category></Not>
+        <Not><Category>X-KDE-settings-network</Category></Not>
+        <Not><Category>X-KDE-settings-webbrowsing</Category></Not>
+        <Not><Category>X-KDE-settings-peripherals</Category></Not>
+        <Not><Category>X-KDE-settings-hardware</Category></Not>
+        <Not><Category>X-KDE-settings-power</Category></Not>
+        <Not><Category>X-KDE-settings-security</Category></Not>
+        <Not><Category>X-KDE-settings-sound</Category></Not>
+        <Not><Category>X-KDE-settings-system</Category></Not>
+        <Not><Category>X-KDE-information</Category></Not>
+      </And>
+    </Include>
+  </Menu> <!-- End Other -->
+
+</Menu> <!-- End Applications -->

diff --git a/xdg/menus/settings.menu b/xdg/menus/settings.menu
new file mode 100644 (file)
index 0000000..588d4cb
--- /dev/null
+++ b/xdg/menus/settings.menu
@@ -0,0 +1,57 @@
+<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
+ "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd">
+
+<Menu>
+
+  <Name>Desktop</Name>
+  <Directory>X-GNOME-Menu-System.directory</Directory>
+
+  <!-- Read standard .directory and .desktop file locations -->
+  <DefaultAppDirs/>
+  <DefaultDirectoryDirs/>
+
+  <!-- Read in overrides and child menus from applications-merged/ -->
+  <DefaultMergeDirs/>
+
+  <!-- Add a link to the control center -->
+  <Include>
+    <Filename>gnomecc.desktop</Filename>
+  </Include>
+
+  <!-- Merge in these other files as submenus -->
+  <Menu>
+    <Name>Preferences</Name>
+    <Directory>Settings.directory</Directory>
+    <Include>
+      <And>
+        <Category>Settings</Category>
+        <Not>
+          <Or>
+            <Category>System</Category>
+            <Filename>gnomecc.desktop</Filename>
+          </Or>
+        </Not>
+      </And>
+    </Include>
+  </Menu>
+
+  <!-- System Settings -->
+  <Menu>
+    <Name>Administration</Name>
+    <Directory>Settings-System.directory</Directory>
+    <Include>
+      <And>
+        <Category>Settings</Category>
+        <Category>System</Category>
+      </And>
+    </Include>
+  </Menu>     <!-- End System Settings -->
+
+  <Layout>
+    <Menuname>Preferences</Menuname>
+    <Menuname>Administration</Menuname>
+    <Merge type="menus"/>
+    <Merge type="files"/>
+  </Layout>
+
+</Menu> <!-- End Settings -->