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

Package-Manager: portage-2.1.3.7

5 files changed, 102 insertions, 5 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/Manifest b/gnome-base/gnome-menus/Manifest
index 0a069fcc7aec..6c5c5b7ebf5d 100644
--- a/gnome-base/gnome-menus/Manifest
+++ b/gnome-base/gnome-menus/Manifest
@@ -1,9 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gnome-menus-2.10.2-legacy_dirs.patch 669 RMD160 970a32433d6311cddd4f1339c3001e23076eb3d6 SHA1 8a9235c02e888df4e450e7deb90934fc9f3b7aba SHA256 791869ce91b9403f9479ac3f1bbdc616cd09b3c529c25c4e48be599f4b7c1d05
 MD5 1a51e652f467b181dcbb71a42db7b5bf files/gnome-menus-2.10.2-legacy_dirs.patch 669
 RMD160 970a32433d6311cddd4f1339c3001e23076eb3d6 files/gnome-menus-2.10.2-legacy_dirs.patch 669
 SHA256 791869ce91b9403f9479ac3f1bbdc616cd09b3c529c25c4e48be599f4b7c1d05 files/gnome-menus-2.10.2-legacy_dirs.patch 669
+AUX gnome-menus-2.18.3-other_category_fix.patch 869 RMD160 e10c8adc4275028335ef52023dd85a139666a350 SHA1 13c6234154de00c1fd50af2d2d55d9c9b2563027 SHA256 b225a08af45290eedcc3ad0fa63766fdc667a1016addedba74bf3dcd7c2628ee
+MD5 7d4db492ca58720e937f9e93f390f856 files/gnome-menus-2.18.3-other_category_fix.patch 869
+RMD160 e10c8adc4275028335ef52023dd85a139666a350 files/gnome-menus-2.18.3-other_category_fix.patch 869
+SHA256 b225a08af45290eedcc3ad0fa63766fdc667a1016addedba74bf3dcd7c2628ee files/gnome-menus-2.18.3-other_category_fix.patch 869
 DIST gnome-menus-2.16.1.tar.bz2 416053 RMD160 667034b93306a0e07322562812ad8f9eaca17160 SHA1 ace531297189f5660fa3578058aa164087854c4f SHA256 72238f33406ada505fde8555ff93c00e7fec055a41500339b434c5445b09c87b
 DIST gnome-menus-2.18.2.tar.bz2 437032 RMD160 e188476dc59e152c0c3a9bd65450af9fb696329c SHA1 1c1b5a32b1b27438fe6fb077e3bf0e3163827668 SHA256 17cf58f617acfbbcfa368212f51ac2c6c2ea6c8c318ef32da5b5e45f3676e080
+DIST gnome-menus-2.18.3.tar.bz2 437539 RMD160 06f26fc98db6650526fdb7bb3557f80b3a598ece SHA1 c50f2503f59b61269a6056d09118f5e04a57ca72 SHA256 c6c0b9a93426dbdcb47fb7e586b9d910e2dbc0e9c894c0f322d08971a7b70933
 EBUILD gnome-menus-2.16.1.ebuild 1102 RMD160 84c3b2f9c77171959170dfe8e0840e41ed324388 SHA1 e689289ccb057791d908727041178ccc1efc58aa SHA256 a5e73334715005549ffb7bb69e0ff25baf1af47df0ee9faaafcb04dffa9acd1c
 MD5 03a65a81f927f14eb8b409940c5c0dc9 gnome-menus-2.16.1.ebuild 1102
 RMD160 84c3b2f9c77171959170dfe8e0840e41ed324388 gnome-menus-2.16.1.ebuild 1102
@@ -12,10 +20,14 @@ EBUILD gnome-menus-2.18.2.ebuild 1096 RMD160 ffeb7d76d370d64bf2a936e506cad3290d3
 MD5 baa5fe291c405c72c7c43adb920671e9 gnome-menus-2.18.2.ebuild 1096
 RMD160 ffeb7d76d370d64bf2a936e506cad3290d3f422d gnome-menus-2.18.2.ebuild 1096
 SHA256 218e04d69c45b30cf1394cb4f213ebd356dd9ff57b2cd9e437047ef7e708fd30 gnome-menus-2.18.2.ebuild 1096
-MISC ChangeLog 9905 RMD160 3bf73019de1720d6951a69f34dddfb150cb1bbe7 SHA1 fb8b9e51cc916736dadcee65b5acd48b65dfc902 SHA256 bd1b1f06273c3fb2e5965f3c37538fcb12dff48969b49d9a5096a7d90b3741cf
-MD5 765f1cd9cb80eafa1e7102114d976db7 ChangeLog 9905
-RMD160 3bf73019de1720d6951a69f34dddfb150cb1bbe7 ChangeLog 9905
-SHA256 bd1b1f06273c3fb2e5965f3c37538fcb12dff48969b49d9a5096a7d90b3741cf ChangeLog 9905
+EBUILD gnome-menus-2.18.3.ebuild 1367 RMD160 3ba72a4084dcade5bc4da474571b152bd5561616 SHA1 5ea1f90b33716f9656552e10fa8495b083e7e919 SHA256 ed99e594a82d44aae8e4dab4fe207b30da241973f7b3735fc2b475ed7410974a
+MD5 59c1daa7a17ebde0706edbe685d4d1a6 gnome-menus-2.18.3.ebuild 1367
+RMD160 3ba72a4084dcade5bc4da474571b152bd5561616 gnome-menus-2.18.3.ebuild 1367
+SHA256 ed99e594a82d44aae8e4dab4fe207b30da241973f7b3735fc2b475ed7410974a gnome-menus-2.18.3.ebuild 1367
+MISC ChangeLog 10229 RMD160 7a86ae35e3c28cc2c491b1238dbbaafa502d3e29 SHA1 07434a3a0ef613df418680e7030b76ddf9cfa48b SHA256 80ad05f883ab0462402d368d0bb0fe6a290182092dffa1381090429ebf3005f3
+MD5 155224748e32230788ac6ecf2a81b4dc ChangeLog 10229
+RMD160 7a86ae35e3c28cc2c491b1238dbbaafa502d3e29 ChangeLog 10229
+SHA256 80ad05f883ab0462402d368d0bb0fe6a290182092dffa1381090429ebf3005f3 ChangeLog 10229
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
@@ -26,3 +38,13 @@ SHA256 0231cb5b9d8d5f7632183cbcdf435268e00b61ff9253efbfa055ce041812e488 files/di
 MD5 cf0c90d7f3dbf8c0d5e0b106c2ed5851 files/digest-gnome-menus-2.18.2 259
 RMD160 c83320bff5a9b074a728d8a2fd09f88cdd777ca3 files/digest-gnome-menus-2.18.2 259
 SHA256 d7ab702abe6bd199885b476f3f7bce0f91ec15e2509ce21a343a03fd625ab205 files/digest-gnome-menus-2.18.2 259
+MD5 f5fb3f1d99a5a2f4002b88ae116be8f9 files/digest-gnome-menus-2.18.3 259
+RMD160 b0a68574c100f6ba48a329c6ac4b7afb92a72248 files/digest-gnome-menus-2.18.3 259
+SHA256 845aeade8de52060cf2a99f8d2887286a10e4744676fb0fe0c094249c4c8bb10 files/digest-gnome-menus-2.18.3 259
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.6 (GNU/Linux)
+
+iD8DBQFG1RyokeYb6olFHJcRAgX5AJ9DiECyoLC1LUGdSo9kBtCgv0yj+QCgtawu
+NIyuyXs/q26srfDdtR1Yfk0=
+=KDQh
+-----END PGP SIGNATURE-----
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
+}