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

(Portage version: 2.2_rc33/cvs/Linux x86_64)

3 files changed, 88 insertions, 1 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/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
+}