Index: gnome-menus-3.8.0-r1.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/gnome-base/gnome-menus/gnome-menus-3.8.0-r1.ebuild,v retrieving revision 1.1 diff -u -r1.1 gnome-menus-3.8.0-r1.ebuild --- gnome-menus-3.8.0-r1.ebuild 27 Jun 2013 18:18:29 -0000 1.1 +++ gnome-menus-3.8.0-r1.ebuild 27 Aug 2013 18:49:00 -0000 @@ -41,6 +41,8 @@ # Adapt for gnome-calculator -> gcalctool desktop file rename (from 'master') epatch "${FILESDIR}/${PN}-3.8.0-gnome-calculator.patch" + # Fix "Others" menu + epatch "${FILESDIR}/${PN}-3.8.0-dont-use-OnlyUnallocated-for-sections.patch" gnome2_src_prepare } Index: files/gnome-menus-3.8.0-dont-use-OnlyUnallocated-for-sections.patch =================================================================== RCS file: files/gnome-menus-3.8.0-dont-use-OnlyUnallocated-for-sections.patch diff -N files/gnome-menus-3.8.0-dont-use-OnlyUnallocated-for-sections.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/gnome-menus-3.8.0-dont-use-OnlyUnallocated-for-sections.patch 27 Aug 2013 18:49:00 -0000 @@ -0,0 +1,303 @@ +From 6e7790b5451bbb8a44b736ed402964d1bb432247 Mon Sep 17 00:00:00 2001 +From: Giovanni Campagna +Date: Mon, 26 Aug 2013 15:59:18 +0200 +Subject: [PATCH] layout: don't use OnlyUnallocated for sections different than + Other + +We used to have OnlyUnallocated on all non-folder sections, as +a quick way to enforce the whitelist, but that broke the Other +section. +Instead, we need a whitelist in the two folders, and a blacklist +in each category the application would normally be in (accessories +or system tools usually). +Ideally, apps in the Utilities category would expose the special +X-GNOME-Utilities desktop category, which we now recognize, but +the whitelist is kept to avoid patching all of them. +For the sundry category, ideally it should not be there at all. + +In the process, a number of .desktop files were removed, as they're +not provided by any packages (checked jhbuild and Fedora 19). They +are: +* caribou +* fedora-im-chooser +* fedora-abrt +* gnome-orca +* gnome-user-share-properties +* ibus +* ibus-daemon + +Distributions that are changing .desktop file names should take +care of patching gnome-menus appropriately. + +https://bugzilla.gnome.org/show_bug.cgi?id=706763 +--- + layout/gnome-applications.menu | 137 ++++++++++++++++++++++++----------------- + 1 file changed, 82 insertions(+), 55 deletions(-) + +diff --git a/layout/gnome-applications.menu b/layout/gnome-applications.menu +index 503f9ca..db56f71 100644 +--- a/layout/gnome-applications.menu ++++ b/layout/gnome-applications.menu +@@ -21,44 +21,49 @@ + + + Accessories +- + Utility.directory + + + Utility +- ++ + Accessibility + System +- +- +- file-roller.desktop +- gnome-file-roller.desktop +- deja-dup-preferences.desktop +- gcalctool.desktop +- gucharmap.desktop +- gnome-gucharmap.desktop +- gnome-font-viewer.desktop +- seahorse.desktop +- gnome-terminal.desktop +- gnome-tweak-tool.desktop +- gnome-disks.desktop +- gnome-screenshot.desktop +- gnome-yelp.desktop +- yelp.desktop +- gnome-control-center.desktop ++ X-GNOME-Utilities + + ++ ++ ++ deja-dup-preferences.desktop ++ eog.desktop ++ evince.desktop ++ file-roller.desktop ++ gcalctool.desktop ++ gnome-control-center.desktop ++ gnome-dictionary.desktop ++ gnome-disks.desktop ++ gnome-font-viewer.desktop ++ gnome-screenshot.desktop ++ gnome-terminal.desktop ++ gnome-tweak-tool.desktop ++ gucharmap.desktop ++ seahorse.desktop ++ vinagre.desktop ++ yelp.desktop ++ ++ ++ alacarte.desktop ++ + + + + + + Universal Access +- + Utility-Accessibility.directory + + +@@ -66,12 +71,16 @@ + Settings + + ++ ++ ++ ++ orca.desktop ++ + + + + + Development +- + Development.directory + + +@@ -79,6 +88,15 @@ + + emacs.desktop + ++ ++ ++ ++ jhbuild.desktop ++ java-1.7.0-openjdk-jconsole.desktop ++ java-1.7.0-openjdk-policytool.desktop ++ log4j-chainsaw.desktop ++ log4j-logfactor5.desktop ++ + + + +@@ -106,7 +124,6 @@ + + + Graphics +- + Graphics.directory + + +@@ -121,15 +138,21 @@ + + + Internet +- + Network.directory + + + Network + X-GNOME-WebApplication +- vinagre.desktop + + ++ ++ ++ ++ vinagre.desktop ++ ++ ++ javaws.desktop ++ + + + +@@ -147,7 +170,6 @@ + + + Multimedia +- + AudioVideo.directory + + +@@ -159,7 +181,6 @@ + + + Office +- + Office.directory + + +@@ -176,20 +197,14 @@ + X-GNOME-Sundry.directory + + alacarte.desktop +- caribou.desktop ++ authconfig.desktop + dconf-editor.desktop +- fedora-im-chooser.desktop + fedora-release-notes.desktop + firewall-config.desktop + flash-player-properties.desktop + gconf-editor.desktop + gnome-abrt.desktop +- fedora-abrt.desktop +- gnome-orca.desktop + gnome-power-statistics.desktop +- gnome-user-share-properties.desktop +- ibus.desktop +- ibus-daemon.desktop + ibus-setup-anthy.desktop + ibus-setup.desktop + ibus-setup-hangul.desktop +@@ -208,7 +223,6 @@ + nm-connection-editor.desktop + orca.desktop + setroubleshoot.desktop +- authconfig.desktop + system-config-date.desktop + system-config-firewall.desktop + system-config-keyboard.desktop +@@ -222,17 +236,30 @@ + + + System +- + System-Tools.directory + + + System + Settings +- baobab.desktop +- gnome-system-log.desktop +- gnome-system-monitor.desktop ++ X-GNOME-Utilities + + ++ ++ ++ ++ baobab.desktop ++ gnome-system-log.desktop ++ gnome-system-monitor.desktop ++ ++ ++ dconf-editor.desktop ++ fedora-release-notes.desktop ++ gconf-editor.desktop ++ gnome-abrt.desktop ++ gnome-power-statistics.desktop ++ dconf-editor.desktop ++ setroubleshoot.desktop ++ + + + +@@ -249,26 +276,26 @@ + Utilities + X-GNOME-Utilities.directory + ++ X-GNOME-Utilities ++ baobab.desktop ++ deja-dup-preferences.desktop ++ eog.desktop ++ evince.desktop + file-roller.desktop + gcalctool.desktop +- gnome-font-viewer.desktop +- gucharmap.desktop +- seahorse.desktop +- gnome-terminal.desktop +- deja-dup-preferences.desktop ++ gnome-control-center.desktop + gnome-dictionary.desktop +- evince.desktop +- eog.desktop +- baobab.desktop ++ gnome-disks.desktop ++ gnome-font-viewer.desktop ++ gnome-screenshot.desktop + gnome-system-log.desktop + gnome-system-monitor.desktop +- vinagre.desktop ++ gnome-terminal.desktop + gnome-tweak-tool.desktop +- gnome-disks.desktop +- gnome-screenshot.desktop +- gnome-yelp.desktop ++ gucharmap.desktop ++ seahorse.desktop ++ vinagre.desktop + yelp.desktop +- gnome-control-center.desktop + + + +-- +1.8.3.1 \ No newline at end of file