Version bump for some rare crash cases. Also include a patch that makes the "Other" submenu really show all the menu items that are not shown elsewhere

(Portage version: 2.1.3.7)

4 files changed, 76 insertions, 1 deletions

diff --git a/gnome-base/gnome-menus/ChangeLog b/gnome-base/gnome-menus/ChangeLog
index 49de9e66f8f7..8c179975ea60 100644
--- a/gnome-base/gnome-menus/ChangeLog
+++ b/gnome-base/gnome-menus/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnome-base/gnome-menus
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-menus/ChangeLog,v 1.79 2007/08/28 18:49:53 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-menus/ChangeLog,v 1.80 2007/08/29 07:14:45 leio Exp $
+
+*gnome-menus-2.18.3 (29 Aug 2007)
+
+  29 Aug 2007; Mart Raudsepp <leio@gentoo.org>
+  +files/gnome-menus-2.18.3-other_category_fix.patch,
+  +gnome-menus-2.18.3.ebuild:
+  Version bump for some rare crash cases. Also include a patch that makes the
+  "Other" submenu really show all the menu items that are not shown elsewhere
 
   28 Aug 2007; Jeroen Roovers <jer@gentoo.org> gnome-menus-2.18.2.ebuild:
   Stable for HPPA (bug #185823).
diff --git a/gnome-base/gnome-menus/files/digest-gnome-menus-2.18.3 b/gnome-base/gnome-menus/files/digest-gnome-menus-2.18.3
new file mode 100644
index 000000000000..149c27f1b9f5
--- /dev/null
+++ b/gnome-base/gnome-menus/files/digest-gnome-menus-2.18.3
@@ -0,0 +1,3 @@
+MD5 e2b97b01b33b9744baf26982a8ad588a gnome-menus-2.18.3.tar.bz2 437539
+RMD160 06f26fc98db6650526fdb7bb3557f80b3a598ece gnome-menus-2.18.3.tar.bz2 437539
+SHA256 c6c0b9a93426dbdcb47fb7e586b9d910e2dbc0e9c894c0f322d08971a7b70933 gnome-menus-2.18.3.tar.bz2 437539
diff --git a/gnome-base/gnome-menus/files/gnome-menus-2.18.3-other_category_fix.patch b/gnome-base/gnome-menus/files/gnome-menus-2.18.3-other_category_fix.patch
new file mode 100644
index 000000000000..b71829dc60c1
--- /dev/null
+++ b/gnome-base/gnome-menus/files/gnome-menus-2.18.3-other_category_fix.patch
@@ -0,0 +1,18 @@
+From http://svn.gnome.org/viewcvs/gnome-menus/trunk/layout/applications.menu?view=patch&r1=666&r2=702&pathrev=702
+Fixes the "Other" submenu, as Application is not a valid category in desktop files, so we shouldn't require it.
+Also exclude screensavers because they'd show up otherwise combined with the previous change.
+This makes all menu entries, that don't match any other category, properly show up in the "Other" submenu.
+
+--- trunk/layout/applications.menu	2007/05/01 10:11:09	666
++++ trunk/layout/applications.menu	2007/06/26 21:20:55	702
+@@ -143,9 +143,9 @@
+     <OnlyUnallocated/>
+     <Include>
+       <And>
+-        <Category>Application</Category>
+         <Not><Category>Core</Category></Not>
+         <Not><Category>Settings</Category></Not>
++        <Not><Category>Screensaver</Category></Not>
+       </And>
+     </Include>
+   </Menu> <!-- End Other -->
diff --git a/gnome-base/gnome-menus/gnome-menus-2.18.3.ebuild b/gnome-base/gnome-menus/gnome-menus-2.18.3.ebuild
new file mode 100644
index 000000000000..5ba3a45543f3
--- /dev/null
+++ b/gnome-base/gnome-menus/gnome-menus-2.18.3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2007 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.18.3.ebuild,v 1.1 2007/08/29 07:14:45 leio Exp $
+
+inherit eutils gnome2 python multilib
+
+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 kernel_linux"
+
+RDEPEND=">=dev-libs/glib-2.6
+	python? (
+				>=dev-lang/python-2.3
+				dev-python/pygtk
+			)"
+DEPEND="${RDEPEND}
+	  sys-devel/gettext
+	>=dev-util/pkgconfig-0.9
+	>=dev-util/intltool-0.35"
+
+DOCS="AUTHORS ChangeLog HACKING NEWS README"
+
+pkg_setup() {
+	G2CONF="$(use_enable kernel_linux inotify) $(use_enable debug) $(use_enable python)"
+}
+
+src_unpack() {
+	gnome2_src_unpack
+	# Don't require the invalid Application category for the Other submenu
+	# This makes all valid desktop files that don't match other categories show up properly in "Other"
+	epatch "${FILESDIR}/${P}-other_category_fix.patch"
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	use python && python_mod_optimize "${ROOT}"usr/$(get_libdir)/python*/site-packages
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+	use python && python_mod_cleanup "${ROOT}"usr/$(get_libdir)/python*/site-packages
+}