Clean up old revisions.

Package-Manager: portage-2.2.0_alpha163/cvs/Linux x86_64
Manifest-Sign-Key: 0xC6085806

5 files changed, 10 insertions, 362 deletions

diff --git a/gnome-base/gnome-menus/ChangeLog b/gnome-base/gnome-menus/ChangeLog
index c8cb95cd1235..5510b2bb873c 100644
--- a/gnome-base/gnome-menus/ChangeLog
+++ b/gnome-base/gnome-menus/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-base/gnome-menus
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-menus/ChangeLog,v 1.182 2013/01/22 08:38:59 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-menus/ChangeLog,v 1.183 2013/03/07 08:36:30 eva Exp $
+
+  07 Mar 2013; Gilles Dartiguelongue <eva@gentoo.org>
+  -gnome-menus-3.4.2-r1.ebuild, -gnome-menus-3.6.1-r2.ebuild,
+  -files/gnome-menus-3.6.1-applications-merged.patch:
+  Clean up old revisions.
 
 *gnome-menus-3.6.2 (22 Jan 2013)
 
diff --git a/gnome-base/gnome-menus/Manifest b/gnome-base/gnome-menus/Manifest
index 7a7c05d48f22..db9cbb7c56e5 100644
--- a/gnome-base/gnome-menus/Manifest
+++ b/gnome-base/gnome-menus/Manifest
@@ -7,28 +7,19 @@ AUX gnome-menus-2.18.3-ignore_kde_standalone.patch 1208 SHA256 6b13ae1708b5d4753
 AUX gnome-menus-3.0.0-ignore_kde_standalone.patch 1222 SHA256 b11842a88d41ad29ae825020432516d613d456a8f57c19ed32921a1cb4ca14fe SHA512 3880e4d288c77bba24be30e5cf7f3297458c9fdc5125b7d1837f7ceb1eec95cf6d3475b94f14c8ae476ad77740cf6300a6e84132d382fbf4620faf01eb51dcd5 WHIRLPOOL 0b68c591c02fd9ec34376fb170ea14a11d2a35bf2527d31d64925886fb07d35598a0d4ab6e4fefe02bfdaf33c7cbb6725126b8eb08eba80ce8ed4a50f0cdeb94
 AUX gnome-menus-3.0.1-applications-merged.patch 3376 SHA256 a42786fa1b3631c649a58c3680ecb102ba450e5bb165cbb11a5d5f27b7e82ca1 SHA512 ca7c17ff68412195d52b7d82351f319403a1d02f0a4a93388bac4034bc0f93ba09fd4d30515d0b05f089a8fd2ea2df3d10ecf51ce340092ec5389d5b1f048444 WHIRLPOOL f157f2e8c78dd3351dee360854e3139927aa274019b0d695242aa54bd353f5ed68a2833db4309a682ad2eea9b0373c50850523d6399e392e0509eb9fdce3adac
 AUX gnome-menus-3.0.2-library-only.patch 641 SHA256 ec729f28aafceeb1a8b61142ce511190ab762bf432356aa7bddf814ee1b556e9 SHA512 2133d3c638f0a7cfddbba17e726c7dc647e469ec716331de95be36c017c3aec86af3d47246836da58743e181fc0d32c869ac80e24a73403970a0d6e16406e1f9 WHIRLPOOL cd5c8694ab3c5f6ec10f573ff22af244185722be86482f45f1182223e4914182fd5143e0f27b0b33abd9e3610ca617f17d90ce6334b77c81d7c36f0f73af177d
-AUX gnome-menus-3.6.1-applications-merged.patch 3535 SHA256 bdd8181b1639a27b5a3967764b15e556ad6d9604f81b6810ddf94e545041b27c SHA512 c8fedf4d747d62ac4543d6e59c2fe701e4b62aa03afda78b61691fc3ea05356080a514edb03ce861187f4f0356ea73a2917e139c3f69d82a98394956569be2ab WHIRLPOOL ba8cee6dc8b4014bbc448a9ab6d9a7e8978681ee98c48de87d6ab322e803e67551551f1da54180784334f066768971169e00a62c5e70d1e49c063a5070e24806
 DIST gnome-menus-2.30.5.tar.bz2 471327 SHA256 6dcc565006d6e8c2025ae83ab1f82edf6bd04d61c804c0dc9bf5ea50629c4caa SHA512 e2722f8fc11d99b58de601171e10f87efd64e8752c26d3e2126ff909a4c263cd8be4842d3592b1029396fecf832aa094630fec2e47ea711a363cd03de2980a22 WHIRLPOOL e0d350971ecb541757ce2282e67010d29807eda61fb79be10e132fddd654529030991648d102cda43c15d0148cafc1627a814aff0b6292f947717e16f697a1bf
 DIST gnome-menus-3.0.1.tar.bz2 474839 SHA256 579c119c26f37781f66708e867ea45b3c37589b3b69e5b32d33e9bdb944165f0 SHA512 05eda56b741d7236b17276b3b208b8370ec8ff0db82e32a2c0adb84334c4d9365fe61dea08183858fb7c0093cf04a02ba1311483e3318dbe816a02c28f4198eb WHIRLPOOL f2583e79ea6aef0c5cffb94001ceba166b97e237861b51d39530155f36720bcfabbf50af0a16735f8112e44a7b8d7243ae9460285f590a0c2a351ad2203dc85e
-DIST gnome-menus-3.4.2.tar.xz 406316 SHA256 fa8b98eb5c62da20f1fb4f6e251f819d78c925006b00d2f63005a6418aa81e63 SHA512 a2710df76e375c3e99ac671a4ea222944b391a731f09fd1615579e89cf847e0eaa837e48a2f56b643e1bb0a2b1da1e952231265661aa71b4f7c2bb31c9e064fd WHIRLPOOL f043295d7f21e14555e72e75d79f228ece0eb6b1953d0fef3c107e841880de39232a5e5fc1ff35a2d152d3a54322074b56d2c5a94b9b15ac3a44a80329e1ee55
-DIST gnome-menus-3.6.1.tar.xz 423060 SHA256 1615f6852280a161cd137d5b8b59f35519a3a7ba89738f55c578325b0512043e SHA512 3124ca6a825e1ab551b44c37ece1872cb50fe6eb5087c04ffd30fd96fce5b9d831ab8727a12bd819d0a3a7025f6f85b0f5c7fa563050a0d5eedf5fb14819808c WHIRLPOOL e39b5d5165d4c972b29aef9f56c9427b01257b1b049270b2a5413f59a43093f6b20d4d77fd54eec2f482b14ce3aa591ed19792783f022895969c58506c31caf5
 DIST gnome-menus-3.6.2.tar.xz 423948 SHA256 f6cefb25ce3ca2a0e4cb43894089cc6079bf948230e99bc0e244b380fa84bf4f SHA512 53beac950e40f121327ab404f42094350c8b2567dbc14e90ee21b5bf514e528bac12beba943f13008a6b860227e01bc630aedb733ae71a9f824688ce640c6ed5 WHIRLPOOL 5f38e1f1c182f67df05a66756c76754737ca5afe2b25e23354c7aead4d8877169c2443fd3a60eeb4bfd4d1fe7193f7d8db9c95afc5f1e4fb505a2d35eed213c2
 EBUILD gnome-menus-2.30.5-r1.ebuild 2682 SHA256 7167af028d6b32cbdb6e5a2814877bbff9f97f697471929aa6a40062ee0aa3e0 SHA512 fbdfa28798997442072d9d8009378bbe57f714ed14971808265543b07ee57e682673314677685f441d12fbaa582715a887fd2ec96950e33133c54207bf6b4b30 WHIRLPOOL 16adfffdee72afe92372a376ddd09692e5ff34dd744c32539e2460fcbb81bd4af6c8d49e7818f0401e6e603437f7c2dc94dc5aae2e467955fd2f322acdaa45a7
 EBUILD gnome-menus-2.30.5.ebuild 2558 SHA256 0734cef39b9dcd27217ab9379e25a503583846761f9ed51b7b6338a0918a0ccf SHA512 41ae0c80b759ca1e61ef9153cbfd2e3b18caff2d3d5931de928c7a8e96caa93f70b99b039e36b337ba1b907587574011bd00c406b368fcdb0a381b495ebb01e7 WHIRLPOOL d37376c813275c2dfd28422d2b61b040b43bcf3193aef5295aa04f4e623904f83bf972d93bbcd946ca1f9376aac386e423afa6a431661f88090f23064f430a86
 EBUILD gnome-menus-3.0.1-r2.ebuild 2206 SHA256 23d9e981e9155512e7929ce28ddc46fbdd6a8d869d0702de3c0e8641235468ce SHA512 9b8961a351bea57f5ba548334c5f3cae34e389b988931c2ac6bb6d2414050131e23298065e49b1a49f09e3d70c7d727ac85055bd016d9809ab4ba320d52d01d8 WHIRLPOOL 2a159c661b56c28e48518152aac51f562ee0c8580a4c024004f1e3368d201b220c88caa21a6a85862d31c47af3abd1f789ac5deba990b270de8be612988ee675
-EBUILD gnome-menus-3.4.2-r1.ebuild 3185 SHA256 353f82dda5686f0f3d64f047c340b36b1fb9fda3cc82aaca41468b36f31364d9 SHA512 e2efcecc6b1cfa3b4fdc534aef837746f5ec6f41ac872f7a6c21c9af8fc297d599f25afe82eb67446bb06de8aaf9d86102737d73c0979be735f5eb6eeb6a84d1 WHIRLPOOL 4cac9da70d8733811ca77fcf8127933f55f25fae1ee1a304e53a651b962f1e9bb298994792cc162183b4cf43ea4cc2e576a85f0b9500e055f848a66acfad08c7
-EBUILD gnome-menus-3.6.1-r2.ebuild 3038 SHA256 f17c8adcc2ab02d69c419c49464bbbcc5ef203df891e16a460e601b478aa07f0 SHA512 09158f995658c3009d63172fe7dbc7e4cd70b7526a9c04fc87cfa5e104bb47d0940b68cedbba7089ca973ab1d63e11b45aeeb4ca970dcb8dd94734631904699b WHIRLPOOL 52bbc7fd9c60e0f56a4bc3071ffbcd9e26a03899229bc26952de4e4a5ea30d66983e8a5d2486b203d8fd401620456b3b0ea427f65e17a9b5bfc51f0c792e4121
 EBUILD gnome-menus-3.6.2.ebuild 2914 SHA256 228c56b929906a0be6e56889c74f6f9f527087b989ffae8b44bdb973f6f7758c SHA512 e44d210aba6b8b603ea9c350c1d7cf764e02b3b211b9615b7017f7c7df072282f233e97d482d27150ea67ad38a4f5a4b5a4dac8e0a3837f206b5580d73c5ac6e WHIRLPOOL a9de37d74d9166d885374b327649cf556d594f88b2e014b7d7be88e0edb7cac5983bbe4a2a7c10e7aedf11242d819517fc54e8b8e46c6b05c2527fee045a5ac8
-MISC ChangeLog 26743 SHA256 f32081bd0a340f51ecdb9d1d0ab930595b8109f4666c36d60e778e5737977c86 SHA512 1085433329d9e0176dd8808802149c1fbb9a7e5dcb5da433586a3b12b33f06ae4baecbe471e35bb7da4ba53fd5389a78d5a4329901223a838364f4e5f27bffa6 WHIRLPOOL d06db939d1c99ecf47d6056451aa09e70be07c35f596ee42f9ab8a45aabeaa3d6526fdb78bb9c2b8685d310efd29912a8b1f6c2f053a254f7c6404e71ac1cebd
+MISC ChangeLog 26934 SHA256 50a8e8eaac41ce76c54a393bbcd825a5dd877b119bfd708ddb1ed05f22edbd7f SHA512 9483781c3c8c2c763f026a9c8dcc9d19965c752e1d41fca6c939643798b8ff91ac4c7e733a7c4f26b701e5afd15947b7ddd09f35f162440ed1b3827f40dffe0f WHIRLPOOL 03ae9856f2afce68310063e642d5a7870719954c1bb0948f444c99bc05c9fc7537dd892fa3ed36d9e3fbc735f8ec6e5d038e9c90a03270f5c66206134abf31c7
 MISC metadata.xml 159 SHA256 b1ccd57b80d8d6ee7a9924844efd69830edfb744ab818d67e50a008b5aae7d4b SHA512 9408846d0f3194f62043b64e325aed9e8cce9a74b556865acf71facc3ad59a092dccbbb3c608ada40b73625eaac93a7bcc976858c6a47426bb8fadb6f830fe2b WHIRLPOOL 4700c8b71899b5acffcc46580315d4d116b478cfa283e0ea0569ab180e46850ce85d73c7370d989e53dd8aecb69ed843d2716bfebd3c5d74a7b5c3d4b94b96bb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQ/lAkAAoJEJ0WA1zPCt1ht9UH/jZje72cASi0nOO2dW2D4CT9
-O2lgtF4522Dr2u8EKtrO43kuFmifMUHQJS5uKTFuUKqVDbifwMswHDcdAEr5vsMJ
-dQ3WLm0qNXgEKwFXTHy7GHwyRSUUoG4XmHUk/wKUM1tlLqQEXPVTZIaEgXXCKTKI
-lPd3gZQ4+zlWmY0LYSNuB/maIMmZhYZCKkLYicUSSB0MtwfmUOiaN2DA+p8nWidN
-dp0vDwX02LjyqpYnYYIC4RYR/gy9SrJ/YBxVuw+QM2uZSXTEAeSu2rfhXcQ5ppc3
-1nG1Hq9EZe1M3wHgyj3OVh9PTB+usCIec5qY0hjqmDyk3f15FAZS6ql8KUAbYis=
-=PfHQ
+iEYEAREIAAYFAlE4UY8ACgkQ1fmVwcYIWAZv/gCgpkozBEoNAGdWDQXWw4WmKEti
+fIsAnj5gO7R+upf4qNBsTnemwnsQKUQd
+=sZX6
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-menus/files/gnome-menus-3.6.1-applications-merged.patch b/gnome-base/gnome-menus/files/gnome-menus-3.6.1-applications-merged.patch
deleted file mode 100644
index ada08df02491..000000000000
--- a/gnome-base/gnome-menus/files/gnome-menus-3.6.1-applications-merged.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-From e047041a49ad9e857b97c534203a98aac80de8d8 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 | 31 +++++++++++++++++++++++++++++--
- 1 file changed, 29 insertions(+), 2 deletions(-)
-
-diff --git a/libmenu/gmenu-tree.c b/libmenu/gmenu-tree.c
-index 3e59c2c..dd6c670 100644
---- a/libmenu/gmenu-tree.c
-+++ b/libmenu/gmenu-tree.c
-@@ -60,6 +60,7 @@ struct _GMenuTree
-   GObject       parent_instance;
- 
-   char *basename;
-+  char *non_prefixed_basename;
-   char *path;
-   char *canonical_path;
- 
-@@ -524,6 +525,24 @@ gmenu_tree_constructor (GType                  type,
- }
- 
- 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 void
- gmenu_tree_set_property (GObject         *object,
-                          guint            prop_id,
-                          const GValue    *value,
-@@ -534,10 +553,14 @@ gmenu_tree_set_property (GObject         *object,
-   switch (prop_id)
-     {
-     case PROP_MENU_BASENAME:
-+      if (g_strcmp0 (self->basename, g_value_get_string (value)))
-+        gmenu_tree_update_non_prefixed_basename (self, g_value_get_string (value));
-       self->basename = g_value_dup_string (value);
-       break;
- 
-     case PROP_MENU_PATH:
-+      if (g_strcmp0 (self->path, g_value_get_string (value)))
-+        gmenu_tree_update_non_prefixed_basename (self, g_value_get_string (value));
-       self->path = g_value_dup_string (value);
-       break;
- 
-@@ -587,6 +610,9 @@ gmenu_tree_finalize (GObject *object)
-     g_free (tree->basename);
-   tree->basename = NULL;
- 
-+  g_free (tree->non_prefixed_basename);
-+  tree->non_prefixed_basename = NULL;
-+
-   if (tree->path != NULL)
-     g_free (tree->path);
-   tree->path = NULL;
-@@ -1896,7 +1922,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",
-@@ -3053,8 +3079,9 @@ gmenu_tree_load_layout (GMenuTree  *tree,
-                 tree->canonical_path);
- 
-   error = NULL;
-+
-   tree->layout = menu_layout_load (tree->canonical_path,
--                                   tree->path ? NULL : tree->basename,
-+                                   tree->non_prefixed_basename,
-                                    error);
-   if (!tree->layout)
-     return FALSE;
--- 
-1.8.0
-
diff --git a/gnome-base/gnome-menus/gnome-menus-3.4.2-r1.ebuild b/gnome-base/gnome-menus/gnome-menus-3.4.2-r1.ebuild
deleted file mode 100644
index f54dd4391ddd..000000000000
--- a/gnome-base/gnome-menus/gnome-menus-3.4.2-r1.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2012 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.4.2-r1.ebuild,v 1.2 2012/12/19 09:55:31 tetromino Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-PYTHON_DEPEND="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="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"
-
-# +python for gmenu-simple-editor
-IUSE="debug +introspection +python test"
-
-COMMON_DEPEND=">=dev-libs/glib-2.29.15:2
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
-	python? (
-		>=dev-libs/gobject-introspection-0.9.5
-		dev-python/pygobject:3
-		x11-libs/gdk-pixbuf:2[introspection]
-		x11-libs/gtk+:3[introspection] )"
-# 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}
-	sys-devel/gettext
-	virtual/pkgconfig
-	>=dev-util/intltool-0.40
-	test? ( dev-libs/gjs )"
-
-pkg_setup() {
-	use python && python_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
-
-	if use python || use introspection; then
-		use introspection || ewarn "Enabling introspection due to USE=python"
-		G2CONF="${G2CONF} --enable-introspection"
-	else
-		G2CONF="${G2CONF} --disable-introspection"
-	fi
-
-	G2CONF="${G2CONF} --disable-static"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Don't show KDE standalone settings desktop files in GNOME others menu
-	epatch "${FILESDIR}/${PN}-3.0.0-ignore_kde_standalone.patch"
-
-	# https://bugzilla.gnome.org/show_bug.cgi?id=688972
-	epatch "${FILESDIR}/${PN}-3.6.1-applications-merged.patch"
-
-	if use python; then
-		python_clean_py-compile_files
-		python_copy_sources
-	else
-		sed -e 's/\(SUBDIRS.*\) simple-editor/\1/' \
-			-i Makefile.* || die "sed failed"
-	fi
-}
-
-src_configure() {
-	if use python; then
-		python_execute_function -s gnome2_src_configure
-	else
-		gnome2_src_configure
-	fi
-}
-
-src_compile() {
-	if use python; then
-		python_execute_function -s gnome2_src_compile
-	else
-		gnome2_src_compile
-	fi
-}
-
-src_test() {
-	if use python; then
-		python_execute_function -s -d
-	else
-		default
-	fi
-}
-
-src_install() {
-	if use python; then
-		python_execute_function -s gnome2_src_install
-		python_clean_installation_image
-	else
-		gnome2_src_install
-	fi
-
-	# 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/
-	newexe "${FILESDIR}/10-xdg-menu-gnome-r1" 10-xdg-menu-gnome
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	if use python; then
-		python_mod_optimize GMenuSimpleEditor
-	fi
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-	if use python; then
-		python_mod_cleanup GMenuSimpleEditor
-	fi
-}
diff --git a/gnome-base/gnome-menus/gnome-menus-3.6.1-r2.ebuild b/gnome-base/gnome-menus/gnome-menus-3.6.1-r2.ebuild
deleted file mode 100644
index b0aad30cd152..000000000000
--- a/gnome-base/gnome-menus/gnome-menus-3.6.1-r2.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2012 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.6.1-r2.ebuild,v 1.1 2012/12/19 09:55:31 tetromino Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{2_6,2_7} )
-
-inherit eutils gnome2 python-r1
-
-DESCRIPTION="The GNOME menu system, implementing the F.D.O cross-desktop spec"
-HOMEPAGE="http://www.gnome.org"
-
-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"
-
-# +python for gmenu-simple-editor
-IUSE="debug +introspection +python test"
-REQUIRED_USE="python? ( introspection )"
-
-COMMON_DEPEND=">=dev-libs/glib-2.29.15:2
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
-	python? (
-		${PYTHON_DEPS}
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-		x11-libs/gdk-pixbuf:2[introspection]
-		x11-libs/gtk+:3[introspection] )"
-# 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() {
-	gnome2_src_prepare
-
-	# Don't show KDE standalone settings desktop files in GNOME others menu
-	epatch "${FILESDIR}/${PN}-3.0.0-ignore_kde_standalone.patch"
-
-	# https://bugzilla.gnome.org/show_bug.cgi?id=688972
-	epatch "${FILESDIR}/${PN}-3.6.1-applications-merged.patch"
-
-	if use python; then
-		python_copy_sources
-	else
-		sed -e 's/\(SUBDIRS.*\) simple-editor/\1/' \
-			-i Makefile.* || die "sed failed"
-	fi
-}
-
-src_configure() {
-	DOCS="AUTHORS ChangeLog HACKING NEWS README"
-
-	# Do NOT compile with --disable-debug/--enable-debug=no
-	# It disables api usage checks
-	G2CONF="${G2CONF}
-		$(usex debug --enable-debug=yes --enable-debug=minimum)
-		$(use_enable introspection)
-		--disable-static"
-
-	if use python; then
-		python_foreach_impl run_in_build_dir gnome2_src_configure
-	else
-		gnome2_src_configure
-	fi
-}
-
-src_compile() {
-	if use python; then
-		python_foreach_impl run_in_build_dir gnome2_src_compile
-	else
-		gnome2_src_compile
-	fi
-}
-
-src_test() {
-	if use python; then
-		python_foreach_impl run_in_build_dir default
-	else
-		default
-	fi
-}
-
-src_install() {
-	if use python; then
-		installing() {
-			gnome2_src_install
-			# Massage shebang to make python_doscript happy
-			sed -e 's:#!'"${PYTHON}:#!/usr/bin/python:" \
-				-i simple-editor/gmenu-simple-editor || die
-				python_doscript simple-editor/gmenu-simple-editor
-			}
-		python_foreach_impl run_in_build_dir installing
-	else
-		gnome2_src_install
-	fi
-
-	# 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/
-	newexe "${FILESDIR}/10-xdg-menu-gnome-r1" 10-xdg-menu-gnome
-}
-
-run_in_build_dir() {
-	pushd "${BUILD_DIR}" > /dev/null || die
-	"$@"
-	popd > /dev/null
-}