5 files changed, 39 insertions, 4 deletions
diff --git a/gnome-base/gnome-menus/ChangeLog b/gnome-base/gnome-menus/ChangeLog
index 6535d8d9883c..59625bdc228d 100644
--- a/gnome-base/gnome-menus/ChangeLog
+++ b/gnome-base/gnome-menus/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-base/gnome-menus
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-menus/ChangeLog,v 1.20 2005/07/11 23:51:11 geoman Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-menus/ChangeLog,v 1.21 2005/08/09 05:15:37 leonardop Exp $
+
+*gnome-menus-2.10.2-r1 (08 Aug 2005)
+
+  08 Aug 2005; Leonardo Boshell <leonardop@gentoo.org>
+  gnome-menus-2.10.2-r1.ebuild, files/gnome-menus-2.10.2-legacy_dirs.patch:
+  Added patch to include additional LegacyDir entries (bug #97839).
 
   11 Jul 2005; Stephen P. Becker <geoman@gentoo.org>
   gnome-menus-2.10.1.ebuild, gnome-menus-2.10.2.ebuild:
diff --git a/gnome-base/gnome-menus/Manifest b/gnome-base/gnome-menus/Manifest
index 3ecde305ad83..3d5693e588d9 100644
--- a/gnome-base/gnome-menus/Manifest
+++ b/gnome-base/gnome-menus/Manifest
@@ -1,6 +1,9 @@
 MD5 a29bae94ebf7641231a8c7dfb3dae255 ChangeLog 2487
 MD5 399885f3069920bad5fb8872cf579977 gnome-menus-2.10.2.ebuild 709
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 e9c8edeec73061e5ae005ceacd255539 gnome-menus-2.10.2-r1.ebuild 866
 MD5 a19124c0b99fc69776cade7dbfa22235 gnome-menus-2.10.1.ebuild 654
 MD5 cf307e62e21ed7239afb4ef30b6c6891 files/digest-gnome-menus-2.10.2 71
+MD5 1a51e652f467b181dcbb71a42db7b5bf files/gnome-menus-2.10.2-legacy_dirs.patch 669
 MD5 c7f0885937a8822cbf1ed58488814d33 files/digest-gnome-menus-2.10.1 71
+MD5 cf307e62e21ed7239afb4ef30b6c6891 files/digest-gnome-menus-2.10.2-r1 71
diff --git a/gnome-base/gnome-menus/files/digest-gnome-menus-2.10.2 b/gnome-base/gnome-menus/files/digest-gnome-menus-2.10.2-r1
index 9be4c619c57e..9be4c619c57e 100644
--- a/gnome-base/gnome-menus/files/digest-gnome-menus-2.10.2
+++ b/gnome-base/gnome-menus/files/digest-gnome-menus-2.10.2-r1
diff --git a/gnome-base/gnome-menus/files/gnome-menus-2.10.2-legacy_dirs.patch b/gnome-base/gnome-menus/files/gnome-menus-2.10.2-legacy_dirs.patch
new file mode 100644
index 000000000000..93390e628a99
--- /dev/null
+++ b/gnome-base/gnome-menus/files/gnome-menus-2.10.2-legacy_dirs.patch
@@ -0,0 +1,14 @@
+diff -NurdB gnome-menus-2.10.2/layout/preferences.menu gnome-menus-2.10.2-patched/layout/preferences.menu
+--- gnome-menus-2.10.2/layout/preferences.menu	2004-11-09 10:06:30.000000000 -0500
++++ gnome-menus-2.10.2-patched/layout/preferences.menu	2005-08-08 22:02:48.000000000 -0500
+@@ -5,6 +5,10 @@
+   <Name>Preferences</Name>
+   <Directory>Settings.directory</Directory>
+ 
++  <!-- Scan legacy dirs first, as later items take priority -->
++  <LegacyDir>/usr/share/control-center-2.0/capplets</LegacyDir>
++  <LegacyDir>/usr/share/gnome/capplets</LegacyDir>
++
+   <!-- Read standard .directory and .desktop file locations -->
+   <DefaultAppDirs/>
+   <DefaultDirectoryDirs/>
diff --git a/gnome-base/gnome-menus/gnome-menus-2.10.2.ebuild b/gnome-base/gnome-menus/gnome-menus-2.10.2-r1.ebuild
index 7abb31b2bd75..5858cb2fb2c4 100644
--- a/gnome-base/gnome-menus/gnome-menus-2.10.2.ebuild
+++ b/gnome-base/gnome-menus/gnome-menus-2.10.2-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 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.10.2.ebuild,v 1.3 2005/07/11 23:51:11 geoman Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-menus/gnome-menus-2.10.2-r1.ebuild,v 1.1 2005/08/09 05:15:37 leonardop Exp $
 
-inherit gnome2
+inherit eutils gnome2
 
 DESCRIPTION="The GNOME menu system, implementing the F.D.O cross-desktop spec"
 HOMEPAGE="http://www.gnome.org"
@@ -21,5 +21,17 @@ DEPEND="${RDEPEND}
 
 DOCS="AUTHORS ChangeLog HACKING NEWS README"
 
-G2CONF="${G2CONF} $(use_enable static)"
 USE_DESTDIR="1"
+
+
+pkg_setup() {
+	G2CONF="$(use_enable static)"
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# Add a couple of important LegacyDir entries. See bug #97839.
+	epatch ${FILESDIR}/${P}-legacy_dirs.patch
+}