Version bump. Performance enhancements, translation updates. Move applications.menu to a prefix, bug #256614.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 95 insertions, 5 deletions

diff --git a/gnome-base/gnome-menus/ChangeLog b/gnome-base/gnome-menus/ChangeLog
index 847eb7f1ac67..aaff81071c8a 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-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-menus/ChangeLog,v 1.128 2009/05/10 18:51:37 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-menus/ChangeLog,v 1.129 2009/07/26 21:46:51 eva Exp $
+
+*gnome-menus-2.26.2 (26 Jul 2009)
+
+  26 Jul 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  +gnome-menus-2.26.2.ebuild:
+  Version bump. Performance enhancements, translation updates.
+  Move applications.menu to a prefix, bug #256614.
 
   10 May 2009; Gilles Dartiguelongue <eva@gentoo.org>
   gnome-menus-2.26.1.ebuild:
diff --git a/gnome-base/gnome-menus/Manifest b/gnome-base/gnome-menus/Manifest
index 2021b3c4aeab..da740fca9350 100644
--- a/gnome-base/gnome-menus/Manifest
+++ b/gnome-base/gnome-menus/Manifest
@@ -1,19 +1,22 @@
 -----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
 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.1.tar.bz2 460916 RMD160 53e37a05b67e8e757888b5726e24c58fc7e15ffa SHA1 e89b4cc483821429fba4db3399e35775e5f73d20 SHA256 2a5696f6673aef57a87bb32e36c51a1a940ca701f6222c864b428b356bfe84e4
+DIST gnome-menus-2.26.2.tar.bz2 438945 RMD160 a3b526d908448c52737edecb8f83c6c99e0d72e9 SHA1 ab914a083ef63bacd960349b3dee3dbd3a005a82 SHA256 c9709695819ffaea92d41647adef8c0a6a408aa9a725e4b2987273bb06115a1c
 EBUILD gnome-menus-2.20.3.ebuild 1483 RMD160 08b88755ce455ff66d87032eb04f7bbe024af6b1 SHA1 bf09bad4d3e913fe65146d2c09592910e02d936a SHA256 e86d99cf81b0b31e9bd05baf662104fdf4b89dc7cddd9675468e44c59c0f0c90
 EBUILD gnome-menus-2.24.2.ebuild 1531 RMD160 73d211c4e9f9f723b424ffdee9c05842e31ad99c SHA1 d1d09a742d5f5c583007f46db8f4d0e7213b9f74 SHA256 5e20e5b98f98ff4921d4ddfdfea0d5c40aebcd33cf529265ae4a0d5f18816de2
 EBUILD gnome-menus-2.26.1.ebuild 1526 RMD160 d8ac63b04ce8824f6488f61ba952b17cf1e0cd87 SHA1 5b2fa7c12494d5896d5d630b31934954425e083d SHA256 a45b1719cf3a28b62d4294eda422edf55e101cc9b6b159cc967d394f5d942ded
-MISC ChangeLog 16840 RMD160 579ee557dfbc9644f52a8fdc646b4287786635ee SHA1 580fc7ac222a9c121421914d8853e48523243ef7 SHA256 634af4d8033bcd5a9e66f7850d752c56b7275e1432dc3d77e1e73854be16484d
+EBUILD gnome-menus-2.26.2.ebuild 2026 RMD160 962170882ddc3b8de2dc39beee2f377172fcf121 SHA1 0328ebe8f95edfd5c39485a3b704615c81f8babc SHA256 f8e375e10a26866a914c095bdbcd42e48171f5448b14f4b6fd12381c29a9c2cb
+MISC ChangeLog 17074 RMD160 4e1844eb3ef03bba1cd22e92b9797fa56d82636c SHA1 da9bdf6de2549b88621841479ec1a1ecbf9687e6 SHA256 87df4ff8b440471796b5e1df2e7f263b895d85f4827179acfaaf6ed3349a2853
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkoHIj4ACgkQ1fmVwcYIWAZNOgCfbLY/2zFcjGx2zgQDtZt+t7mq
-ikwAnizPWZY1e+zGKsfT/lfJP811WrEI
-=S2ZA
+iEYEARECAAYFAkpsztgACgkQ1fmVwcYIWAYISgCfUh0dJ6+DcBwOTmwtHr1UVNvZ
+LEoAoKqqW6fEiIc3lgcBUEINvXou5QJ1
+=wi2l
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-menus/files/10-xdg-menu-gnome b/gnome-base/gnome-menus/files/10-xdg-menu-gnome
new file mode 100644
index 000000000000..b12a712eb45f
--- /dev/null
+++ b/gnome-base/gnome-menus/files/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/gnome-base/gnome-menus/gnome-menus-2.26.2.ebuild b/gnome-base/gnome-menus/gnome-menus-2.26.2.ebuild
new file mode 100644
index 000000000000..87ebb9caa686
--- /dev/null
+++ b/gnome-base/gnome-menus/gnome-menus-2.26.2.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2009 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.26.2.ebuild,v 1.1 2009/07/26 21:46:51 eva Exp $
+
+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? (
+		>=dev-lang/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
+	# FIXME: fix autofoo and report upstream
+	if use debug ; then
+		G2CONF="${G2CONF} --enable-debug=yes"
+	fi
+
+	G2CONF="${G2CONF} $(use_enable python) --disable-static"
+}
+
+src_unpack() {
+	gnome2_src_unpack
+
+	# Don't show KDE standalone settings desktop files in GNOME others menu
+	epatch "${FILESDIR}/${PN}-2.18.3-ignore_kde_standalone.patch"
+
+	# disable pyc compiling
+	mv py-compile py-compile-disabled
+	ln -s $(type -P true) py-compile
+}
+
+src_install() {
+	gnome2_src_install
+
+	# 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_version
+		python_need_rebuild
+		python_mod_optimize $(python_get_sitedir)/GMenuSimpleEditor
+	fi
+
+	ewarn "If you loose icons in applications menus, please re-select your session"
+	ewarn "in your login manager, or set DESKTOP_SESSION in your startup script."
+	ewarn "See bug #256614 for details about this change."
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+	python_mod_cleanup /usr/$(get_libdir)/python*/site-packages/GMenuSimpleEditor
+}