Upstream patch for #291279

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

4 files changed, 137 insertions, 2 deletions

diff --git a/gnome-base/gnome-menus/ChangeLog b/gnome-base/gnome-menus/ChangeLog
index 06c1698e366a..5908b848a96b 100644
--- a/gnome-base/gnome-menus/ChangeLog
+++ b/gnome-base/gnome-menus/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-base/gnome-menus
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-menus/ChangeLog,v 1.145 2010/06/23 14:55:34 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-menus/ChangeLog,v 1.146 2010/07/05 12:02:44 pacho Exp $
+
+*gnome-menus-2.30.2-r1 (05 Jul 2010)
+
+  05 Jul 2010; Pacho Ramos <pacho@gentoo.org> +gnome-menus-2.30.2-r1.ebuild,
+  +files/gnome-menus-2.30.2-XDG_MENU_PREFIX-fix.patch:
+  Revision bump to respect XDG_MENU_PREFIX when writing user menu file, bug
+  #291279 (thanks to netfab for notifying upstream fix).
 
   23 Jun 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   gnome-menus-2.20.3.ebuild, gnome-menus-2.24.2.ebuild,
diff --git a/gnome-base/gnome-menus/Manifest b/gnome-base/gnome-menus/Manifest
index 7c6ec6289608..0c1c2a40b326 100644
--- a/gnome-base/gnome-menus/Manifest
+++ b/gnome-base/gnome-menus/Manifest
@@ -1,5 +1,9 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 10-xdg-menu-gnome 115 RMD160 3e235da94ec1e7f97be144358f105d24ca8144e8 SHA1 f4d0e6dff08acd5b06531973f1f68b5f4a640240 SHA256 d6a4938ed879f908e93d0c917db4c99321cb6fa126b79fe1e878ff2ddade963b
 AUX gnome-menus-2.18.3-ignore_kde_standalone.patch 1208 RMD160 302201bbc2a9b4d6a673904d11ce60390268b4b5 SHA1 58880f2807bc6a11a724a15c4f626f7385e650be SHA256 6b13ae1708b5d4753f38e57e161e58bd31d0b7a9de8b78145052388b150eedb8
+AUX gnome-menus-2.30.2-XDG_MENU_PREFIX-fix.patch 1240 RMD160 a7110e0e80fb4e1a87eef3a057a7346ed552807b SHA1 9923318bc624712d42f85d406a1dc40c7bca3ad9 SHA256 b094d0cd36d3146d19da94de5b46188da468ef11bfa452c3c35268e446290b95
 DIST gnome-menus-2.20.3.tar.bz2 446966 RMD160 eb1ff84b161d8354b1ee30364cefec91a43ff57d SHA1 25c8161f1bb4ecd4a868cbf1b59edcfb06adaa51 SHA256 2ce7a6aabed338ca3f65685e7e46149cdacc80fab0a8701c2d827fcb950a9897
 DIST gnome-menus-2.24.2.tar.bz2 453261 RMD160 f377b2ea6f94a4ecd159e0a095c8a0ea3139ed37 SHA1 8769c37ca8a7045d9b79b02fd3fa3f89442b4271 SHA256 c28cc72e69164533e4a64270486d18b58184920ec4f4b288758758a373d45d3c
 DIST gnome-menus-2.26.2.tar.bz2 438945 RMD160 a3b526d908448c52737edecb8f83c6c99e0d72e9 SHA1 ab914a083ef63bacd960349b3dee3dbd3a005a82 SHA256 c9709695819ffaea92d41647adef8c0a6a408aa9a725e4b2987273bb06115a1c
@@ -9,6 +13,14 @@ EBUILD gnome-menus-2.20.3.ebuild 1417 RMD160 32cb3a0b3bdf6a4bfeab7144ac7e67e2930
 EBUILD gnome-menus-2.24.2.ebuild 1474 RMD160 d7433377abdde9a72ed62d393ae080f499c5f19c SHA1 0e404c844c19c7d81b8ffa561ab7a68fa5942722 SHA256 02968c54ee9f76b6fa9519c9aadb7ec284c1fc6b24fc5d60bc47a4e0f2122f71
 EBUILD gnome-menus-2.26.2.ebuild 2091 RMD160 2402e0bde5e783b6d5e59ceb0d038b7d81338925 SHA1 f9fe365396d34120a6012d50c8ef80d7c6dd4c0e SHA256 074b4f5e308e168daa8770f1921dabbb3fe0962b4eca7ce4c7a5e96db60bfcff
 EBUILD gnome-menus-2.28.0.1.ebuild 2166 RMD160 3d9cde1976d0b5ef0b4639d10afffc50c9cfbf2f SHA1 c94b12a948aeadb181bffbaefca6553086019959 SHA256 2b96f07c8733e24f52d557d193d2e0c76a6dabb3afa6c460e65c7b1692c8de20
+EBUILD gnome-menus-2.30.2-r1.ebuild 2476 RMD160 155a6c129eef5f46f541d2ce2c2ce7ebab03cb38 SHA1 0c9445b5f7178fea1be9dbd57138fbf60ed84820 SHA256 f0640ffd8d62ffe1047ccf30d6b125c891e983fefdd08c81356579dde1191bfe
 EBUILD gnome-menus-2.30.2.ebuild 2354 RMD160 39d06952d50d4f10e3f8bbd11512024efcd87a23 SHA1 f09a9edb9c850c8035ed7ab8c1b434c1b4d928b1 SHA256 bb6d17fa3bdc6dd09c95a4120b2256d3c347f58c20d03a4307ebb94648f48128
-MISC ChangeLog 19212 RMD160 1852b76c23d7b28d8ffe618da4e24d945207fd9c SHA1 e85a47a3776ee4906461735b9177d1ac7c6c62e5 SHA256 40cdf7d55a3aac74059c9ec0d4e6948e16e5ef0b10ac9e5e2312a8f9d1a1268e
+MISC ChangeLog 19513 RMD160 8161473ba00d39bc2beab09b9c29d59f502057bc SHA1 db4f93415fcc7e00bf8cdbf2e4fd3cd3c1a42bab SHA256 63f7df1893b4d6ddc6cf01fd6d40c1ca5e6c02e00587dcc20d1408ae976e745e
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iEYEARECAAYFAkwxyekACgkQCaWpQKGI+9R0EwCfZnd8VyVnMMdln0pvyyEmZUGz
+hp4AnjDojF6LkDWOV6egF7UXCleQrHhc
+=WX4L
+-----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-menus/files/gnome-menus-2.30.2-XDG_MENU_PREFIX-fix.patch b/gnome-base/gnome-menus/files/gnome-menus-2.30.2-XDG_MENU_PREFIX-fix.patch
new file mode 100644
index 000000000000..01e5a48219de
--- /dev/null
+++ b/gnome-base/gnome-menus/files/gnome-menus-2.30.2-XDG_MENU_PREFIX-fix.patch
@@ -0,0 +1,27 @@
+From 2054996af842e6df1726e58d81a569f03e30d75f Mon Sep 17 00:00:00 2001
+From: Vincent Untz <vuntz@gnome.org>
+Date: Wed, 30 Jun 2010 10:36:26 +0000
+Subject: [editor] Better fix for XDG_MENU_PREFIX support in editor
+
+The previous fix was partly wrong, because the menu file referenced in
+the created user menu file was not using the prefix.
+
+So instead of letting the library handle XDG_MENU_PREFIX, we handle it
+ourselves everywhere.
+---
+diff --git a/simple-editor/GMenuSimpleEditor/menutreemodel.py b/simple-editor/GMenuSimpleEditor/menutreemodel.py
+index 5856d56..214319e 100644
+--- a/simple-editor/GMenuSimpleEditor/menutreemodel.py
++++ b/simple-editor/GMenuSimpleEditor/menutreemodel.py
+@@ -107,6 +107,9 @@ class MenuTreeModel (gtk.TreeStore):
+             menu_files = ["applications.menu", "settings.menu"]
+ 
+         for menu_file in menu_files:
++            if menu_file == "applications.menu" and os.environ.has_key ("XDG_MENU_PREFIX"):
++                menu_file = os.environ["XDG_MENU_PREFIX"] + menu_file
++
+             tree = gmenu.lookup_tree (menu_file, gmenu.FLAGS_INCLUDE_EXCLUDED)
+             tree.sort_key = gmenu.SORT_DISPLAY_NAME
+             self.__append_directory (tree.root, None, False, menu_file)
+--
+cgit v0.8.3.1
diff --git a/gnome-base/gnome-menus/gnome-menus-2.30.2-r1.ebuild b/gnome-base/gnome-menus/gnome-menus-2.30.2-r1.ebuild
new file mode 100644
index 000000000000..71f80ccd3213
--- /dev/null
+++ b/gnome-base/gnome-menus/gnome-menus-2.30.2-r1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2010 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.2-r1.ebuild,v 1.1 2010/07/05 12:02:44 pacho Exp $
+
+EAPI="2"
+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 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="debug python"
+
+RDEPEND=">=dev-libs/glib-2.18.0
+	python? (
+		>=virtual/python-2.4.4-r5
+		dev-python/pygtk )"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	>=dev-util/pkgconfig-0.9
+	>=dev-util/intltool-0.40"
+
+DOCS="AUTHORS ChangeLog HACKING NEWS README"
+
+pkg_setup() {
+	# 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} \
+		$(use_enable python) \
+		--disable-static \
+		--disable-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"
+
+	# Respect XDG_MENU_PREFIX when writing user menu file, bug #291279
+	epatch "${FILESDIR}/${P}-XDG_MENU_PREFIX-fix.patch"
+
+	# Fix intltoolize broken file, see upstream #577133
+	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in \
+		|| die "sed failed"
+
+	# disable pyc compiling
+	mv py-compile py-compile-disabled
+	ln -s $(type -P true) py-compile
+}
+
+src_install() {
+	gnome2_src_install
+
+	find "${D}" -name "*.la" -delete || die "remove of la files failed"
+
+	# Prefix menu, bug #256614
+	mv "${D}"/etc/xdg/menus/applications.menu \
+		"${D}"/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"
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	if use python; then
+		python_need_rebuild
+		python_mod_optimize $(python_get_sitedir)/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 $(python_get_sitedir)/GMenuSimpleEditor
+	fi
+}