From e2d0133e2528c6a19c03e4d1d267a5e146aa8f55 Mon Sep 17 00:00:00 2001
From: Markos Chandras <hwoarang@gentoo.org>
Date: Sun, 16 Mar 2014 13:21:01 +0000
Subject: Fix bug #503678 for real this time

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xC2BA7F3C!
---
 lxde-base/lxde-meta/ChangeLog                 |  5 ++++-
 lxde-base/lxde-meta/Manifest                  | 32 +++++++++++++--------------
 lxde-base/lxde-meta/lxde-meta-0.5.5-r4.ebuild |  4 ++--
 3 files changed, 22 insertions(+), 19 deletions(-)

(limited to 'lxde-base')

diff --git a/lxde-base/lxde-meta/ChangeLog b/lxde-base/lxde-meta/ChangeLog
index 2000b54fb1ae..2272a9566c75 100644
--- a/lxde-base/lxde-meta/ChangeLog
+++ b/lxde-base/lxde-meta/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for lxde-base/lxde-meta
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxde-meta/ChangeLog,v 1.59 2014/03/16 10:27:44 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxde-meta/ChangeLog,v 1.60 2014/03/16 13:20:58 hwoarang Exp $
+
+  16 Mar 2014; Markos Chandras <hwoarang@gentoo.org> lxde-meta-0.5.5-r4.ebuild:
+  Fix bug #503678 for real this time
 
 *lxde-meta-0.5.5-r4 (16 Mar 2014)
 
diff --git a/lxde-base/lxde-meta/Manifest b/lxde-base/lxde-meta/Manifest
index 4f3388f2288e..1558c997cd28 100644
--- a/lxde-base/lxde-meta/Manifest
+++ b/lxde-base/lxde-meta/Manifest
@@ -2,25 +2,25 @@
 Hash: SHA256
 
 EBUILD lxde-meta-0.5.5-r3.ebuild 1104 SHA256 03ca98e1e634d4a44aaab14592ac6f6d2846fa54d652e7f6cecc679da5a113c1 SHA512 df1776b8d9032e54cfb28dbf3518fceadfac35c633fb3d3458ce1ac40563e1911f7b31c22b5d2feb1dfb7bc7707510207283649e5c83409caffac40397e60bba WHIRLPOOL b156e06d7de1e24bce586fe49e27a9101a6fc3a4bd8bdca913228177729c27a20c53eb722d61804cc8031844ef61939526dec291e68d8a791ff9692419229b5f
-EBUILD lxde-meta-0.5.5-r4.ebuild 1108 SHA256 ee322b5444747fdb77880bbc4c744e2576eb9c3f8a2b14e0f442000be852a838 SHA512 fe435e68cd5ac06fb180b994384d5e391b12655b747fb6ec05cb55a86bc571f5c1cbf3b864b90d561e165c8f2257202b71b96fca8e7b9d214706a1b4006e3884 WHIRLPOOL 9348c1aae46a405633c7985df3e5480898f2bb10f0236db101c3d64ebcb105afccd5dd30b5d9a771db3f7577a0a90960479b7a5703429ba23a1b336ff2d1b7bc
-MISC ChangeLog 8100 SHA256 28dd282c29276d91e6089b2ee5e6f6db90508212bba9ce1235a4f393f1122b58 SHA512 eb42a6d8b819047b9ae9a57caf4e03b41625922909e0c6a65d4c70849bcf85af7326749a65f90d4461895c0f7102bd2a6a2f3a6fd5bd957fe8a07ef8b6c97ca3 WHIRLPOOL 473465e59bfe35c4f8375b55600a3dac2a61154dcd95b214c3995c450cc3d7640ca82b2811810d651b9d3681a1691aaed32cc8a6c96e37bf9c5b21fe345381d4
+EBUILD lxde-meta-0.5.5-r4.ebuild 1138 SHA256 c2faba105d047a9cb86be4852a54eb4336553c2df5a227d0674b9817c491706d SHA512 0f0e64b984618c2b0ad1a43c96a93d55db24dfb8b511f88add2487ac04235cbd384e19de32f706d4fea69888100b3a3ce346be24471e77a235c604765d523506 WHIRLPOOL 1a5ee0905d20b546cf4a5c2947aa544d67aa1070e91560f6ee8135f35ab5544b406976da5e5f7d888b1b39c1c54b6ba0371066d57b456553cf59aed74dc7556b
+MISC ChangeLog 8218 SHA256 fa723b8479dcf88be490241e61d433102143cf4b76f2c62789340401d113bd8d SHA512 b670f605bd117a5627a260d1f87c84ea3292a0a0f3fd4f2a0097c6505b16e3c34eebdf7f739e4eee6097bf372c4efbf898858a20b2c4593edcc0466a0f93771a WHIRLPOOL e58ef6c7a6e5fe727e3b9b34599075b031bfe6c868103341644f7ccc5543ca48fd68b2d008dc7d7fcb624c5f1120b2dd611a5bc32681c07c6520dffff7b7058a
 MISC metadata.xml 159 SHA256 09574ccad15f69d5367ecbb1a491cd636fb88582f69987d2ec217109dfe8befb SHA512 b4d06538d607c5ba81e0070475cd7d0a221b19e2adf740f479398a647c97350eb6d02b7db8bde107b0c369ce0058b8f0639468c0ca519ff585c555a0bfd4a381 WHIRLPOOL f5dfee2db356573e21cdb76ebcd11a61d2dc7f2b2b8458589cdabb1b2fd21f3261d0b40144b1417d433d1078a9c31a6b4562a914068719df66dfd4563714d9ab
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJTJXxcXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJTJaT2XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
-OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88W3wP/jUaA/NaV7c/POUg5vyTy932
-HckNGozazAzvmYaJNqTA31lMI4Iz9qwRsLm18jy9bQptOo+1tL2M9tmXBhXO1AqI
-WmsIp74EkI6LWjdt+mIHC9eXVPmj0kvNrzuk8kUd4yVGPAfMWt4AxNNsthn/ID6W
-Mc5+ujJGHeZp5yTHE6Lsm4tkaqFfnfNlEro0in7MCLF0xz57eMsqrCvb7fPZboUX
-5Fd3asL0glkfQtnXuDp9XySZWU74UXoD+u1/C/zs2rTLvaE01LSwiW90H6IuPDJR
-jcWnNFr9+ItYuwwJZp2cecYJnqgdKhkc7HoNwrwStVzI8a5zG+rgVOcNVsGjdpWi
-UvkL5MOzPL2B8MkHshewUiZjKt4RISnz2tkCXOmgP65qSPIVA13HuEBDjQ7t+xG2
-sNrhvOWBKqsy0EVdSP+V/5QISmRgo24f52COherVAj4GlDMWd7xzzYYpaDuxV4ru
-uwp1UDUC4+KeDswpfL4wnUAoXuksatVI95ERBocx8fZU7WF4eP3Bsp7VcFnJ4NB/
-uKOqG2JXiG8JEIwFTKxHUi3nvbGCDrC7d7HnI6x9E766xStmwUNKsTvwMmEPBTB6
-ohI3cdBh4OMIhIf7vQdQmYo2nDQc5AF8fhiXTurw6uHQ7F5cOktpMjwX3lCFJPfP
-5oFkiBI91z6+HwJpr1Tr
-=AXth
+OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88xHIP/0+0m5V4lVj53Wki+Pz73drA
+aVQI0OuBztAIpqkeBrxn8WaIAUFRzoIWs9q1+q29Ki42+sh1EdT6uMYyghED656n
+ZZbolfq8sL/etS96kZbrZ/xSWDnkw11Jx6XZ88HZ3lLlOuHCezVirZdrVSvPeqX6
+Q9TgJPdNjNNKlY9gJsk+/iKaeYd/iqQiWWcY7O8bMsT/rrmc734qLitCDAuxkqxZ
+gw/P0IxTgsy/IZlQzOOcvTCJSDDVxof2eLS9A0J5ooOjriJi7TWK8FqCb5nHY9Ks
+1eWSCXEGPokd9RVpDx4KUWeB5azTnssTlybGD45NALix4PS7+HdYfoyg3UO9KSYa
+/z+fL/RDehlFBJJ5F1ACqZxBj76u1VCYD7SOnE5lfQT5HzeeEWRWMy86gXMmnLOx
+R+L8ayjsFz+aqY6V1SZNp9hGokHcAz/UMRH1cUUwZnnb7+l4fkbfxkCjjg2i1Ysq
+6boaCAC+l7OROnQCp3zw8EMK6IQ/Zt83wU8oH5Rs662wp+2QTo3gQ0YqwcM79xpt
+iwKALW2tqJzPNS74LUUEqUnmSaE3bIUdbSLBcHrBJR299M/D5AiqPr1JZjDZP2Gj
+G5kR0b2MlRSppT9wroUTufzBdrIAccejDBYMVpWuAInh6wuOLa/5IxbBuvNNo+1b
+6gouxaX0wDahfK2a4g5T
+=GSKq
 -----END PGP SIGNATURE-----
diff --git a/lxde-base/lxde-meta/lxde-meta-0.5.5-r4.ebuild b/lxde-base/lxde-meta/lxde-meta-0.5.5-r4.ebuild
index 9d72d3fc4488..42827b1887d7 100644
--- a/lxde-base/lxde-meta/lxde-meta-0.5.5-r4.ebuild
+++ b/lxde-base/lxde-meta/lxde-meta-0.5.5-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxde-meta/lxde-meta-0.5.5-r4.ebuild,v 1.1 2014/03/16 10:27:44 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxde-meta/lxde-meta-0.5.5-r4.ebuild,v 1.2 2014/03/16 13:20:58 hwoarang Exp $
 
 EAPI="2"
 
@@ -23,7 +23,7 @@ RDEPEND=">=lxde-base/menu-cache-0.3.3
 	|| ( ( <=lxde-base/lxsession-0.4.6.1
 		=lxde-base/lxsession-edit-0.2* )
 		>lxde-base/lxsession-0.4.6.1 )
-	=lxde-base/lxshortcut-0.1*
+	|| ( >=x11-libs/libfm-1.2.0 =lxde-base/lxshortcut-0.1* )
 	=lxde-base/lxtask-0.1*
 	=lxde-base/lxterminal-0.1.11*
 	media-gfx/gpicview
-- 
cgit v1.2.3-65-gdbad