Drop old (#508854)

(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

12 files changed, 13 insertions, 772 deletions

diff --git a/gnome-base/gnome-menus/ChangeLog b/gnome-base/gnome-menus/ChangeLog
index ab48b2896b6b..e679d9bae7ad 100644
--- a/gnome-base/gnome-menus/ChangeLog
+++ b/gnome-base/gnome-menus/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for gnome-base/gnome-menus
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-menus/ChangeLog,v 1.213 2014/10/11 12:00:52 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-menus/ChangeLog,v 1.214 2014/11/13 11:27:41 pacho Exp $
+
+  13 Nov 2014; Pacho Ramos <pacho@gentoo.org> -files/10-xdg-menu-gnome,
+  -files/10-xdg-menu-gnome-r1,
+  -files/gnome-menus-2.18.3-ignore_kde_standalone.patch,
+  -files/gnome-menus-3.0.0-ignore_kde_standalone.patch,
+  -files/gnome-menus-3.0.1-applications-merged.patch,
+  -files/gnome-menus-3.0.2-library-only.patch,
+  -files/gnome-menus-3.8.0-dont-use-OnlyUnallocated-for-sections.patch,
+  -files/gnome-menus-3.8.0-gnome-calculator.patch,
+  -gnome-menus-2.30.5-r1.ebuild, -gnome-menus-3.0.1-r2.ebuild,
+  -gnome-menus-3.10.1.ebuild:
+  Drop old (#508854)
 
   11 Oct 2014; Markus Meier <maekke@gentoo.org> gnome-menus-3.10.1-r1.ebuild:
   arm stable, bug #512012
diff --git a/gnome-base/gnome-menus/files/10-xdg-menu-gnome b/gnome-base/gnome-menus/files/10-xdg-menu-gnome
deleted file mode 100644
index b12a712eb45f..000000000000
--- a/gnome-base/gnome-menus/files/10-xdg-menu-gnome
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-if [ -z "$XDG_MENU_PREFIX" ] && [ "$DESKTOP_SESSION" = "gnome" ]
-then
-	export XDG_MENU_PREFIX=gnome-
-fi
diff --git a/gnome-base/gnome-menus/files/10-xdg-menu-gnome-r1 b/gnome-base/gnome-menus/files/10-xdg-menu-gnome-r1
deleted file mode 100644
index 4bbf86381083..000000000000
--- a/gnome-base/gnome-menus/files/10-xdg-menu-gnome-r1
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-if [ -z "$XDG_MENU_PREFIX" ] && { [ "$DESKTOP_SESSION" = "gnome" ] || [ "$DESKTOP_SESSION" = "cinnamon" ]; }
-then
-	export XDG_MENU_PREFIX=gnome-
-fi
diff --git a/gnome-base/gnome-menus/files/gnome-menus-2.18.3-ignore_kde_standalone.patch b/gnome-base/gnome-menus/files/gnome-menus-2.18.3-ignore_kde_standalone.patch
deleted file mode 100644
index 895f5f2ca525..000000000000
--- a/gnome-base/gnome-menus/files/gnome-menus-2.18.3-ignore_kde_standalone.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- layout/applications.menu.orig	2007-09-21 17:51:43.000000000 +0300
-+++ layout/applications.menu	2007-09-21 17:55:38.000000000 +0300
-@@ -146,6 +146,19 @@
-         <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 -->
diff --git a/gnome-base/gnome-menus/files/gnome-menus-3.0.0-ignore_kde_standalone.patch b/gnome-base/gnome-menus/files/gnome-menus-3.0.0-ignore_kde_standalone.patch
deleted file mode 100644
index 5f5f8b2703e6..000000000000
--- a/gnome-base/gnome-menus/files/gnome-menus-3.0.0-ignore_kde_standalone.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- layout/applications.menu.orig	2007-09-21 17:51:43.000000000 +0300
-+++ layout/applications.menu	2007-09-21 17:55:38.000000000 +0300
-@@ -146,6 +146,19 @@
-         <Not><Category>Core</Category></Not>
-         <Not><Category>Screensaver</Category></Not>
-         <Not><Category>X-GNOME-Settings-Panel</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 -->
diff --git a/gnome-base/gnome-menus/files/gnome-menus-3.0.1-applications-merged.patch b/gnome-base/gnome-menus/files/gnome-menus-3.0.1-applications-merged.patch
deleted file mode 100644
index f5255cc5466e..000000000000
--- a/gnome-base/gnome-menus/files/gnome-menus-3.0.1-applications-merged.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-From 15baddac6c5343eaa103ecd27c625f5a415d24f3 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Sat, 24 Nov 2012 15:24:50 -0500
-Subject: [PATCH] libmenu: always call menu_layout_load() with
- non_prefixed_name parameter
-
-We must ensure that when loading "${XDG_MENU_PREFIX}applications.menu",
-the root layout node's name is set to "applications", not
-"${XDG_MENU_PREFIX}applications", because the menu spec states that the
-default merge directory for "${XDG_MENU_PREFIX}applications.menu" is
-"applications-merged", not "${XDG_MENU_PREFIX}applications-merged".
-
-https://bugzilla.gnome.org/show_bug.cgi?id=688972
----
- libmenu/gmenu-tree.c | 29 ++++++++++++++++++++++++++---
- 1 file changed, 26 insertions(+), 3 deletions(-)
-
-diff --git a/libmenu/gmenu-tree.c b/libmenu/gmenu-tree.c
-index 0cb9645..a0d85d6 100644
---- a/libmenu/gmenu-tree.c
-+++ b/libmenu/gmenu-tree.c
-@@ -47,6 +47,7 @@ struct GMenuTree
-   guint         refcount;
- 
-   char *basename;
-+  char *non_prefixed_basename;
-   char *absolute_path;
-   char *canonical_path;
- 
-@@ -630,6 +631,24 @@ gmenu_tree_lookup (const char     *menu_file,
-   return retval;
- }
- 
-+static void
-+gmenu_tree_update_non_prefixed_basename (GMenuTree   *tree,
-+                                         const gchar *filename)
-+{
-+  gchar *s, *basename;
-+
-+  g_free (tree->non_prefixed_basename);
-+  tree->non_prefixed_basename = NULL;
-+  if (filename == NULL)
-+    return;
-+  s = g_strdup_printf ("%sapplications.menu", g_getenv ("XDG_MENU_PREFIX"));
-+  basename = g_path_get_basename (filename);
-+  if (!g_strcmp0 (basename, "applications.menu") || !g_strcmp0 (basename, s))
-+    tree->non_prefixed_basename = g_strdup ("applications.menu");
-+  g_free (s);
-+  g_free (basename);
-+}
-+
- static GMenuTree *
- gmenu_tree_new (GMenuTreeType   type,
- 		const char     *menu_file,
-@@ -650,11 +669,13 @@ gmenu_tree_new (GMenuTreeType   type,
-     {
-       g_assert (canonical == FALSE);
-       tree->basename = g_strdup (menu_file);
-+      gmenu_tree_update_non_prefixed_basename (tree, tree->basename);
-     }
-   else
-     {
-       tree->canonical     = canonical != FALSE;
-       tree->absolute_path = g_strdup (menu_file);
-+      gmenu_tree_update_non_prefixed_basename (tree, tree->absolute_path);
- 
-       if (tree->canonical)
- 	{
-@@ -709,6 +730,9 @@ gmenu_tree_unref (GMenuTree *tree)
-     g_free (tree->basename);
-   tree->basename = NULL;
- 
-+  g_free (tree->non_prefixed_basename);
-+  tree->non_prefixed_basename = NULL;
-+
-   if (tree->absolute_path != NULL)
-     g_free (tree->absolute_path);
-   tree->absolute_path = NULL;
-@@ -1768,7 +1792,7 @@ load_merge_file (GMenuTree      *tree,
- 
-   menu_verbose ("Merging file \"%s\"\n", canonical);
- 
--  to_merge = menu_layout_load (canonical, NULL, NULL);
-+  to_merge = menu_layout_load (canonical, tree->non_prefixed_basename, NULL);
-   if (to_merge == NULL)
-     {
-       menu_verbose ("No menu for file \"%s\" found when merging\n",
-@@ -2926,8 +2950,7 @@ gmenu_tree_load_layout (GMenuTree *tree)
- 
-   error = NULL;
-   tree->layout = menu_layout_load (tree->canonical_path,
--                                   tree->type == GMENU_TREE_BASENAME ?
--                                        tree->basename : NULL,
-+                                   tree->non_prefixed_basename,
-                                    &error);
-   if (tree->layout == NULL)
-     {
--- 
-1.8.0
-
diff --git a/gnome-base/gnome-menus/files/gnome-menus-3.0.2-library-only.patch b/gnome-base/gnome-menus/files/gnome-menus-3.0.2-library-only.patch
deleted file mode 100644
index b55ed7edd9f2..000000000000
--- a/gnome-base/gnome-menus/files/gnome-menus-3.0.2-library-only.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From f2ad7820b3a6b197f8cfec9e2bec877e51671ec9 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gmail.com>
-Date: Thu, 18 Aug 2011 20:05:56 -0400
-Subject: [PATCH 2/2] Do not install anything other than the library
-
----
- Makefile.am |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 565ab87..65c059a 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,7 +1,7 @@
--SUBDIRS = libmenu desktop-directories layout util po
-+SUBDIRS = libmenu util po
- 
- if HAVE_PYTHON
--SUBDIRS += python simple-editor
-+SUBDIRS += python
- endif
- 
- ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
--- 
-1.7.6
-
diff --git a/gnome-base/gnome-menus/files/gnome-menus-3.8.0-dont-use-OnlyUnallocated-for-sections.patch b/gnome-base/gnome-menus/files/gnome-menus-3.8.0-dont-use-OnlyUnallocated-for-sections.patch
deleted file mode 100644
index 611415cb10f6..000000000000
--- a/gnome-base/gnome-menus/files/gnome-menus-3.8.0-dont-use-OnlyUnallocated-for-sections.patch
+++ /dev/null
@@ -1,303 +0,0 @@
-From 6e7790b5451bbb8a44b736ed402964d1bb432247 Mon Sep 17 00:00:00 2001
-From: Giovanni Campagna <gcampagn@redhat.com>
-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 submenu -->
-   <Menu>
-     <Name>Accessories</Name>
--    <OnlyUnallocated/>
-     <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 -->
-+	<!-- 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>
--
--        <!-- Also exclude everything we put in the X-GNOME-Utilities
--             whitelist -->
--        <Not><Filename>file-roller.desktop</Filename></Not>
--        <Not><Filename>gnome-file-roller.desktop</Filename></Not>
--        <Not><Filename>deja-dup-preferences.desktop</Filename></Not>
--        <Not><Filename>gcalctool.desktop</Filename></Not>
--        <Not><Filename>gucharmap.desktop</Filename></Not>
--        <Not><Filename>gnome-gucharmap.desktop</Filename></Not>
--        <Not><Filename>gnome-font-viewer.desktop</Filename></Not>
--        <Not><Filename>seahorse.desktop</Filename></Not>
--        <Not><Filename>gnome-terminal.desktop</Filename></Not>
--        <Not><Filename>gnome-tweak-tool.desktop</Filename></Not>
--        <Not><Filename>gnome-disks.desktop</Filename></Not>
--        <Not><Filename>gnome-screenshot.desktop</Filename></Not>
--        <Not><Filename>gnome-yelp.desktop</Filename></Not>
--        <Not><Filename>yelp.desktop</Filename></Not>
--        <Not><Filename>gnome-control-center.desktop</Filename></Not>
-+        <Not><Category>X-GNOME-Utilities</Category></Not>
-       </And>
-     </Include>
-+    <Exclude>
-+      <!-- Exclude everything we put in the X-GNOME-Utilities whitelist.
-+
-+           Please keep the list alphabetically sorted! -->
-+      <Filename>deja-dup-preferences.desktop</Filename>
-+      <Filename>eog.desktop</Filename>
-+      <Filename>evince.desktop</Filename>
-+      <Filename>file-roller.desktop</Filename>
-+      <Filename>gcalctool.desktop</Filename>
-+      <Filename>gnome-control-center.desktop</Filename>
-+      <Filename>gnome-dictionary.desktop</Filename>
-+      <Filename>gnome-disks.desktop</Filename>
-+      <Filename>gnome-font-viewer.desktop</Filename>
-+      <Filename>gnome-screenshot.desktop</Filename>
-+      <Filename>gnome-terminal.desktop</Filename>
-+      <Filename>gnome-tweak-tool.desktop</Filename>
-+      <Filename>gucharmap.desktop</Filename>
-+      <Filename>seahorse.desktop</Filename>
-+      <Filename>vinagre.desktop</Filename>
-+      <Filename>yelp.desktop</Filename>
-+
-+      <!-- Exclude Sundry items -->
-+      <Filename>alacarte.desktop</Filename>
-+    </Exclude>
-   </Menu> <!-- End Accessories -->
-
-
-   <!-- Accessibility submenu -->
-   <Menu>
-     <Name>Universal Access</Name>
--    <OnlyUnallocated/>
-     <Directory>Utility-Accessibility.directory</Directory>
-     <Include>
-       <And>
-@@ -66,12 +71,16 @@
-         <Not><Category>Settings</Category></Not>
-       </And>
-     </Include>
-+
-+    <Exclude>
-+      <!-- Sundry exclusions -->
-+      <Filename>orca.desktop</Filename>
-+    </Exclude>
-   </Menu> <!-- End Accessibility -->
-
-   <!-- Development Tools -->
-   <Menu>
-     <Name>Development</Name>
--    <OnlyUnallocated/>
-     <Directory>Development.directory</Directory>
-     <Include>
-       <And>
-@@ -79,6 +88,15 @@
-       </And>
-       <Filename>emacs.desktop</Filename>
-     </Include>
-+
-+    <Exclude>
-+      <!-- Sundry exclusions -->
-+      <Filename>jhbuild.desktop</Filename>
-+      <Filename>java-1.7.0-openjdk-jconsole.desktop</Filename>
-+      <Filename>java-1.7.0-openjdk-policytool.desktop</Filename>
-+      <Filename>log4j-chainsaw.desktop</Filename>
-+      <Filename>log4j-logfactor5.desktop</Filename>
-+    </Exclude>
-   </Menu> <!-- End Development Tools -->
-
-   <!-- Education -->
-@@ -106,7 +124,6 @@
-   <!-- Graphics -->
-   <Menu>
-     <Name>Graphics</Name>
--    <OnlyUnallocated/>
-     <Directory>Graphics.directory</Directory>
-     <Include>
-       <And>
-@@ -121,15 +138,21 @@
-   <!-- Internet -->
-   <Menu>
-     <Name>Internet</Name>
--    <OnlyUnallocated/>
-     <Directory>Network.directory</Directory>
-     <Include>
-       <And>
-         <Category>Network</Category>
- 	<Not><Category>X-GNOME-WebApplication</Category></Not>
--        <Not><Filename>vinagre.desktop</Filename></Not>
-       </And>
-     </Include>
-+
-+    <Exclude>
-+      <!-- Utilities exclusions -->
-+      <Filename>vinagre.desktop</Filename>
-+
-+      <!-- Sundry exclusions -->
-+      <Filename>javaws.desktop</Filename>
-+    </Exclude>
-   </Menu>   <!-- End Internet -->
-
-   <!-- Web Applications -->
-@@ -147,7 +170,6 @@
-   <!-- Multimedia -->
-   <Menu>
-     <Name>Multimedia</Name>
--    <OnlyUnallocated/>
-     <Directory>AudioVideo.directory</Directory>
-     <Include>
-       <And>
-@@ -159,7 +181,6 @@
-   <!-- Office -->
-   <Menu>
-     <Name>Office</Name>
--    <OnlyUnallocated/>
-     <Directory>Office.directory</Directory>
-     <Include>
-       <And>
-@@ -176,20 +197,14 @@
-     <Directory>X-GNOME-Sundry.directory</Directory>
-     <Include>
-       <Filename>alacarte.desktop</Filename>
--      <Filename>caribou.desktop</Filename>
-+      <Filename>authconfig.desktop</Filename>
-       <Filename>dconf-editor.desktop</Filename>
--      <Filename>fedora-im-chooser.desktop</Filename>
-       <Filename>fedora-release-notes.desktop</Filename>
-       <Filename>firewall-config.desktop</Filename>
-       <Filename>flash-player-properties.desktop</Filename>
-       <Filename>gconf-editor.desktop</Filename>
-       <Filename>gnome-abrt.desktop</Filename>
--      <Filename>fedora-abrt.desktop</Filename>
--      <Filename>gnome-orca.desktop</Filename>
-       <Filename>gnome-power-statistics.desktop</Filename>
--      <Filename>gnome-user-share-properties.desktop</Filename>
--      <Filename>ibus.desktop</Filename>
--      <Filename>ibus-daemon.desktop</Filename>
-       <Filename>ibus-setup-anthy.desktop</Filename>
-       <Filename>ibus-setup.desktop</Filename>
-       <Filename>ibus-setup-hangul.desktop</Filename>
-@@ -208,7 +223,6 @@
-       <Filename>nm-connection-editor.desktop</Filename>
-       <Filename>orca.desktop</Filename>
-       <Filename>setroubleshoot.desktop</Filename>
--      <Filename>authconfig.desktop</Filename>
-       <Filename>system-config-date.desktop</Filename>
-       <Filename>system-config-firewall.desktop</Filename>
-       <Filename>system-config-keyboard.desktop</Filename>
-@@ -222,17 +236,30 @@
-   <!-- System Tools-->
-   <Menu>
-     <Name>System</Name>
--    <OnlyUnallocated/>
-     <Directory>System-Tools.directory</Directory>
-     <Include>
-       <And>
-         <Category>System</Category>
-         <Not><Category>Settings</Category></Not>
--        <Not><Filename>baobab.desktop</Filename></Not>
--        <Not><Filename>gnome-system-log.desktop</Filename></Not>
--        <Not><Filename>gnome-system-monitor.desktop</Filename></Not>
-+        <Not><Category>X-GNOME-Utilities</Category></Not>
-       </And>
-     </Include>
-+
-+    <Exclude>
-+      <!-- Utilities exclusions -->
-+      <Filename>baobab.desktop</Filename>
-+      <Filename>gnome-system-log.desktop</Filename>
-+      <Filename>gnome-system-monitor.desktop</Filename>
-+
-+      <!-- Sundry exclusions -->
-+      <Filename>dconf-editor.desktop</Filename>
-+      <Filename>fedora-release-notes.desktop</Filename>
-+      <Filename>gconf-editor.desktop</Filename>
-+      <Filename>gnome-abrt.desktop</Filename>
-+      <Filename>gnome-power-statistics.desktop</Filename>
-+      <Filename>dconf-editor.desktop</Filename>
-+      <Filename>setroubleshoot.desktop</Filename>
-+    </Exclude>
-   </Menu>   <!-- End System Tools -->
-
-   <!-- System Settings -->
-@@ -249,26 +276,26 @@
-     <Name>Utilities</Name>
-     <Directory>X-GNOME-Utilities.directory</Directory>
-     <Include>
-+      <Category>X-GNOME-Utilities</Category>
-+      <Filename>baobab.desktop</Filename>
-+      <Filename>deja-dup-preferences.desktop</Filename>
-+      <Filename>eog.desktop</Filename>
-+      <Filename>evince.desktop</Filename>
-       <Filename>file-roller.desktop</Filename>
-       <Filename>gcalctool.desktop</Filename>
--      <Filename>gnome-font-viewer.desktop</Filename>
--      <Filename>gucharmap.desktop</Filename>
--      <Filename>seahorse.desktop</Filename>
--      <Filename>gnome-terminal.desktop</Filename>
--      <Filename>deja-dup-preferences.desktop</Filename>
-+      <Filename>gnome-control-center.desktop</Filename>
-       <Filename>gnome-dictionary.desktop</Filename>
--      <Filename>evince.desktop</Filename>
--      <Filename>eog.desktop</Filename>
--      <Filename>baobab.desktop</Filename>
-+      <Filename>gnome-disks.desktop</Filename>
-+      <Filename>gnome-font-viewer.desktop</Filename>
-+      <Filename>gnome-screenshot.desktop</Filename>
-       <Filename>gnome-system-log.desktop</Filename>
-       <Filename>gnome-system-monitor.desktop</Filename>
--      <Filename>vinagre.desktop</Filename>
-+      <Filename>gnome-terminal.desktop</Filename>
-       <Filename>gnome-tweak-tool.desktop</Filename>
--      <Filename>gnome-disks.desktop</Filename>
--      <Filename>gnome-screenshot.desktop</Filename>
--      <Filename>gnome-yelp.desktop</Filename>
-+      <Filename>gucharmap.desktop</Filename>
-+      <Filename>seahorse.desktop</Filename>
-+      <Filename>vinagre.desktop</Filename>
-       <Filename>yelp.desktop</Filename>
--      <Filename>gnome-control-center.desktop</Filename>
-     </Include>
-   </Menu>
-
---
-1.8.3.1
\ No newline at end of file
diff --git a/gnome-base/gnome-menus/files/gnome-menus-3.8.0-gnome-calculator.patch b/gnome-base/gnome-menus/files/gnome-menus-3.8.0-gnome-calculator.patch
deleted file mode 100644
index 83a4a83d60bc..000000000000
--- a/gnome-base/gnome-menus/files/gnome-menus-3.8.0-gnome-calculator.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 599c7b05c432b1571a7105f1ebf6bbe30c36dbdf Mon Sep 17 00:00:00 2001
-From: Kalev Lember <kalevlember@gmail.com>
-Date: Thu, 28 Mar 2013 21:54:34 +0000
-Subject: Adapt for gnome-calculator -> gcalctool desktop file rename
-
-gnome-calculator.desktop was renamed back to gcalctool.desktop, at the
-very last minute before the 3.8.0 release.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=696816
----
-diff --git a/layout/gnome-applications.menu b/layout/gnome-applications.menu
-index 84d13ed..503f9ca 100644
---- a/layout/gnome-applications.menu
-+++ b/layout/gnome-applications.menu
-@@ -38,7 +38,6 @@
-         <Not><Filename>file-roller.desktop</Filename></Not>
-         <Not><Filename>gnome-file-roller.desktop</Filename></Not>
-         <Not><Filename>deja-dup-preferences.desktop</Filename></Not>
--        <Not><Filename>gnome-calculator.desktop</Filename></Not>
-         <Not><Filename>gcalctool.desktop</Filename></Not>
-         <Not><Filename>gucharmap.desktop</Filename></Not>
-         <Not><Filename>gnome-gucharmap.desktop</Filename></Not>
-@@ -251,7 +250,7 @@
-     <Directory>X-GNOME-Utilities.directory</Directory>
-     <Include>
-       <Filename>file-roller.desktop</Filename>
--      <Filename>gnome-calculator.desktop</Filename>
-+      <Filename>gcalctool.desktop</Filename>
-       <Filename>gnome-font-viewer.desktop</Filename>
-       <Filename>gucharmap.desktop</Filename>
-       <Filename>seahorse.desktop</Filename>
-@@ -287,7 +286,6 @@
-         <Not><Filename>gnome-eog.desktop</Filename></Not>
-         <Not><Filename>gnome-file-roller.desktop</Filename></Not>
-         <Not><Filename>gnome-gucharmap.desktop</Filename></Not>
--        <Not><Filename>gcalctool.desktop</Filename></Not>
-       </And>
-     </Include>
-   </Menu> <!-- End Other -->
---
-cgit v0.9.2
diff --git a/gnome-base/gnome-menus/gnome-menus-2.30.5-r1.ebuild b/gnome-base/gnome-menus/gnome-menus-2.30.5-r1.ebuild
deleted file mode 100644
index a8a245f59990..000000000000
--- a/gnome-base/gnome-menus/gnome-menus-2.30.5-r1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-menus/gnome-menus-2.30.5-r1.ebuild,v 1.11 2013/04/09 16:43:03 ago Exp $
-
-EAPI="3"
-GCONF_DEBUG="no"
-
-PYTHON_DEPEND="python? 2:2.5"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit eutils gnome2 python
-
-DESCRIPTION="The GNOME menu system, implementing the F.D.O cross-desktop spec"
-HOMEPAGE="http://www.gnome.org"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="debug +introspection python"
-
-RDEPEND=">=dev-libs/glib-2.18
-	python? ( dev-python/pygtk )
-	introspection? ( >=dev-libs/gobject-introspection-0.6.7 )"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig
-	>=dev-util/intltool-0.40"
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog HACKING NEWS README"
-
-	# Do NOT compile with --disable-debug/--enable-debug=no
-	# It disables api usage checks
-	if ! use debug ; then
-		G2CONF="${G2CONF} --enable-debug=minimum"
-	fi
-
-	G2CONF="${G2CONF}
-		--disable-static
-		$(use_enable python)
-		$(use_enable introspection)"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Don't show KDE standalone settings desktop files in GNOME others menu
-	epatch "${FILESDIR}/${PN}-2.18.3-ignore_kde_standalone.patch"
-	# https://bugzilla.gnome.org/show_bug.cgi?id=688972
-	epatch "${FILESDIR}/${PN}-3.0.1-applications-merged.patch"
-
-	# disable pyc compiling
-	python_clean_py-compile_files
-
-	python_copy_sources
-}
-
-src_configure() {
-	python_execute_function -s gnome2_src_configure
-}
-
-src_compile() {
-	python_execute_function -s gnome2_src_compile
-}
-
-src_test() {
-	python_execute_function -s -d
-}
-
-src_install() {
-	python_execute_function -s gnome2_src_install
-	python_clean_installation_image
-
-	# Prefix menu, bug #256614
-	mv "${ED}"/etc/xdg/menus/applications.menu \
-		"${ED}"/etc/xdg/menus/gnome-applications.menu || die "menu move failed"
-
-	exeinto /etc/X11/xinit/xinitrc.d/
-	doexe "${FILESDIR}/10-xdg-menu-gnome" || die "doexe failed"
-
-	use python && python_convert_shebangs -r 2 "${ED}"usr/bin/gmenu-simple-editor
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	if use python; then
-		python_mod_optimize GMenuSimpleEditor
-	fi
-
-	ewarn "Due to bug #256614, you might lose icons in applications menus."
-	ewarn "If you use a login manager, please re-select your session."
-	ewarn "If you use startx and have no .xinitrc, just export XSESSION=Gnome."
-	ewarn "If you use startx and have .xinitrc, export XDG_MENU_PREFIX=gnome-."
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-	if use python; then
-		python_mod_cleanup GMenuSimpleEditor
-	fi
-}
diff --git a/gnome-base/gnome-menus/gnome-menus-3.0.1-r2.ebuild b/gnome-base/gnome-menus/gnome-menus-3.0.1-r2.ebuild
deleted file mode 100644
index 3d821cedfd52..000000000000
--- a/gnome-base/gnome-menus/gnome-menus-3.0.1-r2.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-menus/gnome-menus-3.0.1-r2.ebuild,v 1.5 2014/02/22 21:43:41 pacho Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-GNOME_TARBALL_SUFFIX="bz2"
-
-PYTHON_DEPEND="python? 2:2.5"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*"
-
-inherit autotools eutils gnome2 python
-
-DESCRIPTION="The GNOME menu system, implementing the F.D.O cross-desktop spec"
-HOMEPAGE="http://www.gnome.org"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-
-IUSE="debug python +introspection"
-
-RDEPEND=">=dev-libs/glib-2.18
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig
-	>=dev-util/intltool-0.40
-
-	gnome-base/gnome-common
-	dev-libs/gobject-introspection-common"
-# eautoreconf requires gnome-common
-# The actual menus are provided by slot 3
-PDEPEND="gnome-base/gnome-menus:3"
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog HACKING NEWS README"
-
-	# Do NOT compile with --disable-debug/--enable-debug=no
-	# It disables api usage checks
-	if ! use debug ; then
-		G2CONF="${G2CONF} --enable-debug=minimum"
-	fi
-
-	G2CONF="${G2CONF}
-		--disable-static
-		$(use_enable python)
-		$(use_enable introspection)"
-
-	python_pkg_setup
-}
-
-src_prepare() {
-	# Only build the library (everything else is coming from slot 3)
-	epatch "${FILESDIR}/${PN}-3.0.2-library-only.patch"
-	# https://bugzilla.gnome.org/show_bug.cgi?id=688972
-	epatch "${FILESDIR}/${PN}-3.0.1-applications-merged.patch"
-	eautoreconf
-	gnome2_src_prepare
-
-	# disable pyc compiling
-	python_clean_py-compile_files
-
-	python_copy_sources
-}
-
-src_configure() {
-	python_execute_function -s gnome2_src_configure
-}
-
-src_compile() {
-	python_execute_function -s gnome2_src_compile
-}
-
-src_test() {
-	python_execute_function -s -d
-}
-
-src_install() {
-	python_execute_function -s gnome2_src_install
-	python_clean_installation_image
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-}
diff --git a/gnome-base/gnome-menus/gnome-menus-3.10.1.ebuild b/gnome-base/gnome-menus/gnome-menus-3.10.1.ebuild
deleted file mode 100644
index 78d3a8a3e377..000000000000
--- a/gnome-base/gnome-menus/gnome-menus-3.10.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-menus/gnome-menus-3.10.1.ebuild,v 1.4 2014/03/09 11:58:42 pacho Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit gnome2
-
-DESCRIPTION="Library for the Desktop Menu fd.o specification"
-HOMEPAGE="https://git.gnome.org/browse/gnome-menus"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="3"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-
-IUSE="debug +introspection test"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.29.15:2
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
-"
-# Older versions of slot 0 install the menu editor and the desktop directories
-
-RDEPEND="${COMMON_DEPEND}
-	!<gnome-base/gnome-menus-3.0.1-r1:0
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.40
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? ( dev-libs/gjs )
-"
-
-src_prepare() {
-	# Don't show KDE standalone settings desktop files in GNOME others menu
-	epatch "${FILESDIR}/${PN}-3.8.0-ignore_kde_standalone.patch"
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	DOCS="AUTHORS ChangeLog HACKING NEWS README"
-
-	# Do NOT compile with --disable-debug/--enable-debug=no
-	# It disables api usage checks
-	gnome2_src_configure \
-		$(usex debug --enable-debug=yes --enable-debug=minimum) \
-		$(use_enable introspection) \
-		--disable-static
-}