gnome-main-menu live ebuild update

git-svn-id: http://piczu-overlay.googlecode.com/svn/trunk@45 0805d722-a2c2-11dd-9b86-41075523de00

4 files changed, 27 insertions, 39 deletions

diff --git a/gnome-base/gnome-main-menu/Manifest b/gnome-base/gnome-main-menu/Manifest
index 873bf24..f68b08f 100644
--- a/gnome-base/gnome-main-menu/Manifest
+++ b/gnome-base/gnome-main-menu/Manifest
@@ -2,11 +2,10 @@ AUX 01-gnome-main-menu-autogen-noconfigure.patch 311 RMD160 95677c7e1b9ad70da4ed
 AUX 02-configure.in-remove-gtk-doc.patch 294 RMD160 f8b9ce6278f571100fed70ecc81fe90138684d66 SHA1 98a38d24d77d22cae147ce4ccb9613227cede22e SHA256 7cc166e363984001656f253848b31ac20322e11762d92efffc604393792c9f09
 AUX 03-tracker-search.patch 714 RMD160 daa5b0e6d26930edc0c53394e99286dd761b4021 SHA1 9faf44d33f002d5ebdbb93b212c6f429d933d83c SHA256 7c9477a924f30c0a869b8232b6f6b575a614d02f046c52896ef75468558d571f
 AUX 04-disable-search.patch 595 RMD160 6d50cf4442e34119909e47a11157d985a098681d SHA1 2e51810689bee5b69b13276c3bec3810418b7b4c SHA256 b901cdd617380c3024b7f8c8aaedfd3e84115ede27ff33ec67c427f9a692eced
-AUX gnome-main-menu-gentooifications.patch 2030 RMD160 bc6ef61d00685f20fb3547bfe2310d223c7fc1bd SHA1 d04b196f89d7df3dcfd578ed9cf1c7c0486cc0f9 SHA256 6a179864f1c18a3de9fd37a776277a1dacddee1fd6a229dd47acb46ce330b88a
-AUX gnome-main-menu-gentooifications.patch~ 1577 RMD160 15bc812e3847d85b541ad6ea3c76b1332251eca1 SHA1 17b899827f460d75f11f9776026189bd31043e98 SHA256 9770fbdf849bc9462c6b2f63879895c477d00950984a6668220459bcfec5dba2
-AUX gnome-main-menu-shutdown-add.patch 1243 RMD160 6e46d2af5d157c7c83f5255133115ea424ca1c5c SHA1 e7ad0e17670d5ed01e690ca06b1a9750720aff18 SHA256 d2dd99e9b9e3b260ada980e1c11bc42405f9928454066335ea70bd70ccd2b9e1
-AUX gnome-main-menu-shutdown-add.patch~ 756 RMD160 9b8daaf622be64120ffe9fc881c80a3579a002fd SHA1 04fbfc159b1b20b537dd5d9033faa2185984593a SHA256 177f52e034221f494f948474a25488ad2a579a88bb16eb8f4d7a0928c03feffa
+AUX gnome-main-menu-gentooifications.patch 2599 RMD160 16975132a0b05e1c164e995a198dc85e559ad632 SHA1 a9521b9f8cd56b114407ae0664ca1e5c7e1126c6 SHA256 b4d5396b6be302d6975987d4bef812aa89a42991bbbe55030673f8c65d71e67e
+AUX gnome-main-menu-gentooifications.patch~ 2030 RMD160 bc6ef61d00685f20fb3547bfe2310d223c7fc1bd SHA1 d04b196f89d7df3dcfd578ed9cf1c7c0486cc0f9 SHA256 6a179864f1c18a3de9fd37a776277a1dacddee1fd6a229dd47acb46ce330b88a
+AUX gnome-main-menu-shutdown-add.patch 487 RMD160 21905fe1dabdcf921261e29a3fe2222d4c6bab8c SHA1 27fb618a4452f8a8f1ff17c468ceac0f5868bbe8 SHA256 85d24607f22bdf2ae88c98bd0f018bf03c94606921670e13842796fe691b7eba
+AUX gnome-main-menu-shutdown-add.patch~ 1243 RMD160 6e46d2af5d157c7c83f5255133115ea424ca1c5c SHA1 e7ad0e17670d5ed01e690ca06b1a9750720aff18 SHA256 d2dd99e9b9e3b260ada980e1c11bc42405f9928454066335ea70bd70ccd2b9e1
 AUX gnome-session-shutdown.desktop 245 RMD160 896aed8e30687a95b7ab71fd8bef5c93c2683f5e SHA1 a2f6d7419847a19ca51ee0b5dea5eddcc7d33de2 SHA256 b085dbd59997c5f92cdcdfe741fc67048261c4260f61ab254bd202ea7eff5aca
 EBUILD gnome-main-menu-0.9.10.ebuild 2007 RMD160 f7b51e35b8a0cbc72d6567bb857688842a9b3d5d SHA1 1b96f8a0982cf3732497d464490eca304e60de94 SHA256 9e49c2b292a0f1fefe1214ef7819d9a6cf2a7b26f6ef4a1d666b9de881a0881f
-EBUILD gnome-main-menu-9999.ebuild 2253 RMD160 451adb71eac9d1ad56e16915d4df75d7d5cb4bfb SHA1 cf4a903ebb03728b9c643d80cac9e7a1e04097e3 SHA256 06f65e0677993d7fea29892ec65e1364eaa7caba9dd7874741c94e3698278c9a
-MISC gnome-main-menu-9999.ebuild~ 2252 RMD160 225a97894f974164b6ab4796d265e40931ee16d3 SHA1 249c2d96a75ed9e43c744815fafe00010418f23a SHA256 a80f17b5bdc7763cbb978f245e5f2170a9839401600f04c66661bd83edf68176
+EBUILD gnome-main-menu-9999.ebuild 2122 RMD160 1e5554c15c2274b281b3fd25993d0d464af5a6d0 SHA1 6cf4c8349b1217e2d4d882c779cd02cb4a9de206 SHA256 b790b142eb950399e4f783e9fcdff81366bb0a737ebc80a6301d61a0d1e4bbee
diff --git a/gnome-base/gnome-main-menu/files/gnome-main-menu-gentooifications.patch b/gnome-base/gnome-main-menu/files/gnome-main-menu-gentooifications.patch
index 802fe0c..836e9c3 100644
--- a/gnome-base/gnome-main-menu/files/gnome-main-menu-gentooifications.patch
+++ b/gnome-base/gnome-main-menu/files/gnome-main-menu-gentooifications.patch
@@ -1,5 +1,5 @@
---- main-menu/etc/applications.xbel 
-+++ main-menu/etc/applications.xbel 
+--- main-menu/etc/applications.xbel.orig	2009-03-26 17:16:48.000000000 +0100
++++ main-menu/etc/applications.xbel	2009-03-26 17:20:05.000000000 +0100
 @@ -3,7 +3,7 @@
        xmlns:bookmark="http://www.freedesktop.org/standards/desktop-bookmarks"
        xmlns:mime="http://www.freedesktop.org/standards/shared-mime-info"
@@ -9,6 +9,15 @@
      <info>
        <metadata owner="http://freedesktop.org">
          <mime:mime-type type="application/x-desktop"/>
+@@ -11,7 +11,7 @@
+           <bookmark:group>rank-0</bookmark:group>
+         </bookmark:groups>
+         <bookmark:applications>
+-          <bookmark:application name="Firefox" exec="firefox %u" timestamp="1168926682" count="1"/>
++          <bookmark:application name="Firefox" exec="firefox-bin %u" timestamp="1168926682" count="1"/>
+         </bookmark:applications>
+       </metadata>
+     </info>
 @@ -42,7 +42,7 @@
        </metadata>
      </info>
@@ -18,9 +27,9 @@
      <info>
        <metadata owner="http://freedesktop.org">
          <mime:mime-type type="application/x-desktop"/>
---- main-menu/etc/system-items.xbel.orig	2008-11-02 00:37:16.000000000 +0100
-+++ main-menu/etc/system-items.xbel	2008-11-02 00:37:00.000000000 +0100
-@@ -30,7 +30,7 @@
+--- main-menu/etc/system-items.xbel.in.orig	2009-03-26 17:17:00.000000000 +0100
++++ main-menu/etc/system-items.xbel.in	2009-03-26 17:21:21.000000000 +0100
+@@ -43,7 +43,7 @@
        </metadata>
      </info>
    </bookmark>
@@ -29,11 +38,12 @@
      <info>
        <metadata owner="http://freedesktop.org">
          <mime:mime-type type="application/x-desktop"/>
-@@ -44,6 +44,7 @@
+@@ -51,7 +51,7 @@
+           <bookmark:group>rank-3</bookmark:group>
+         </bookmark:groups>
+         <bookmark:applications>
+-          <bookmark:application name="Install Software" exec="package-manager %F" timestamp="1168926816" count="1"/>
++          <bookmark:application name="Install Software" exec="porthole %F" timestamp="1168926816" count="1"/>
+         </bookmark:applications>
+       </metadata>
      </info>
-   </bookmark>
-   <bookmark href="gnome-screensaver-lock.desktop" added="2007-01-16T05:53:36Z" modified="2007-01-16T05:53:36Z" visited="2007-01-16T05:53:36Z">
-+    <title>Lock Screen</title>
-     <info>
-       <metadata owner="http://freedesktop.org">
-         <mime:mime-type type="application/x-desktop"/>
diff --git a/gnome-base/gnome-main-menu/files/gnome-main-menu-shutdown-add.patch b/gnome-base/gnome-main-menu/files/gnome-main-menu-shutdown-add.patch
index d55fee2..94aee85 100644
--- a/gnome-base/gnome-main-menu/files/gnome-main-menu-shutdown-add.patch
+++ b/gnome-base/gnome-main-menu/files/gnome-main-menu-shutdown-add.patch
@@ -1,21 +1,3 @@
---- main-menu/etc/system-items.xbel.orig	2008-11-02 00:40:19.000000000 +0100
-+++ main-menu/etc/system-items.xbel	2008-11-02 00:41:33.000000000 +0100
-@@ -71,4 +71,15 @@
-       </metadata>
-     </info>
-   </bookmark>
-+  <bookmark href="gnome-session-shutdown.desktop" added="2007-01-16T05:53:36Z" modified="2007-01-16T05:53:36Z" visited="2007-01-16T05:53:36Z">
-+    <title>Shutdown</title>
-+    <info>
-+      <metadata owner="http://freedesktop.org">
-+        <mime:mime-type type="application/x-desktop"/>
-+        <bookmark:applications>
-+          <bookmark:application name="Shutdown" exec="gnome-session-save --shutdown-dialog" timestamp="1168926816" count="1"/>
-+        </bookmark:applications>
-+      </metadata>
-+    </info>
-+  </bookmark>
- </xbel>
 --- main-menu/etc/Makefile.am.orig	2008-11-02 00:57:12.000000000 +0100
 +++ main-menu/etc/Makefile.am	2008-11-02 00:57:22.000000000 +0100
 @@ -10,7 +10,7 @@
diff --git a/gnome-base/gnome-main-menu/gnome-main-menu-9999.ebuild b/gnome-base/gnome-main-menu/gnome-main-menu-9999.ebuild
index 57e3b11..949eedb 100644
--- a/gnome-base/gnome-main-menu/gnome-main-menu-9999.ebuild
+++ b/gnome-base/gnome-main-menu/gnome-main-menu-9999.ebuild
@@ -51,9 +51,6 @@ src_unpack() {
 	gnome2_omf_fix
 
 	epatch "${FILESDIR}"/gnome-main-menu-gentooifications.patch
-	# shutdown
-	epatch "${FILESDIR}"/gnome-main-menu-shutdown-add.patch
-	cp ${FILESDIR}/gnome-session-shutdown.desktop main-menu/etc/
 
 	use libssui && epatch "${FILESDIR}"/gnome-main-menu-libssui.patch
 	use doc || epatch "${FILESDIR}"/02-configure.in-remove-gtk-doc.patch