libfm-1.2.0 now provides lxshortcut. Bug #503678. Patch by Johannes Janssen <mail@johannes-janssen.de>

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xC2BA7F3C!

4 files changed, 28 insertions, 19 deletions

diff --git a/x11-libs/libfm/ChangeLog b/x11-libs/libfm/ChangeLog
index dbc86ddba63c..5693b47c1c1b 100644
--- a/x11-libs/libfm/ChangeLog
+++ b/x11-libs/libfm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/libfm
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libfm/ChangeLog,v 1.99 2014/03/12 05:03:24 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libfm/ChangeLog,v 1.100 2014/03/16 10:32:42 hwoarang Exp $
+
+  16 Mar 2014; Markos Chandras <hwoarang@gentoo.org> libfm-1.2.0.ebuild,
+  libfm-9999.ebuild:
+  libfm-1.2.0 now provides lxshortcut. Bug #503678. Patch by Johannes Janssen
+  <mail@johannes-janssen.de>
 
   09 Mar 2014; Pawel Hajdan jr <phajdan.jr@gentoo.org> libfm-1.1.4.ebuild:
   x86 stable wrt bug #494440
diff --git a/x11-libs/libfm/Manifest b/x11-libs/libfm/Manifest
index f4df712a7557..aaf5e0b5052d 100644
--- a/x11-libs/libfm/Manifest
+++ b/x11-libs/libfm/Manifest
@@ -7,24 +7,26 @@ DIST libfm-1.1.4.tar.xz 699080 SHA256 8512c22b89d11e9c0f6044feeb72a96ac542116012
 DIST libfm-1.2.0.tar.xz 890064 SHA256 f0513484e43dcc576097508b7d666f7eb72530963e5a21692034a7ea6a6efc22 SHA512 a62d3b8a26bf52c058f49e9b5328409f32189c708c0de8f419e7946e0be19f2d5dad604a214381b98bf1b26a81e85f60bced8b29b40bbfeb7e1c0aee4d1e36f2 WHIRLPOOL b78c4ad2b36b2729d520bde2da32543abf2a3fa043057fd71c80c0f744abbf39092da6b15e34dc8c7ca8e9237b8df4d55a7f367cba6115179ec6c1c78985e129
 EBUILD libfm-0.1.17-r1.ebuild 1744 SHA256 f95b9a221f951124a89b7e067b2534bc8cb98131e3112781e5f0de2106ca5588 SHA512 60400b6633ce414d29b6797904d1a3eacfb3d372e89cc765a822e92a2ba6f26294401d6989d0dd3a939b01572fcf5f89eedd6416ea15cfb2e8eed7cf45b99f90 WHIRLPOOL 05c0eb3b9813ccd33fa352e5904928e6f8fbd48a325832765a294a394de951bfa5fb2113cf3be7d786c743cddf8ad75b291bc9a5915d5a0de6083f7499f7b519
 EBUILD libfm-1.1.4.ebuild 3265 SHA256 a1d34a0c63898aac0d956b261d564fed9f72614ddf90228f92295eae5908cfdd SHA512 f79355b7fc0579043c86ff427fb81b1d446eaf60b65be8d464fb3c01b7baa5d1a8f98b77bd7ad8a940464652f98ed758d0546659ff917516856f3e0f5ddfc1ba WHIRLPOOL a79fd0d3a790e767f1cf8be2d4a8af74a12486813deb6d59c9531b7f808fa60c1b04cfbc0eebf256888965c895904f2db5991cee983631b883b40aae4b6af872
-EBUILD libfm-1.2.0.ebuild 3269 SHA256 538776ea6e5e0efa7e0e1c9c6546a640542410cc26973df2f7d24ef5e77e68db SHA512 62b5314988c84fb800e1198ea97238db12594a27c5a507d9fa45ccede3d6095f66802d759a0bd4af1e24e74a703b843081efa4c1c2ae33f917ee4d821209a20c WHIRLPOOL fb84c0af1a385e307631b19aa409a0f2c0deb15bcd72b72bf810be1265ffce746be4da0f385823ce867392ce9c74dd803edc1e93c62327dba90354b0e10576dd
-EBUILD libfm-9999.ebuild 3314 SHA256 87d599a88fe44a19c31c854a5152cfa3da4392a70380b9794a3e9cc369907fdb SHA512 abb0e8c8d7185c22fe59f60cfb551289c6269c38c44a737c14592fb0b47d678c06dc68906a586b54f8554b604a8a30c8d7caaa1ddd43b1798d798c358b997097 WHIRLPOOL 7dbe581bd5f7296214f7506e9506af24a1dc573f0ba31d005c0584b323173351b0a33352a0a1139f49dc44e80273db951e622532f34001fa750e37188acab01c
-MISC ChangeLog 14419 SHA256 7fe93a3a06e5d345ce0686f6d10932966fcadaba28d5b03035a87e51b61bc372 SHA512 6b91a13ccecae7fddcb3df856244878124e00e15e8ba1b232bf8ffefe3c090a31f79959829745275aa82596a3d30f864df306f7ea2c6d4082d83636fd6a8194b WHIRLPOOL 5da932b7bc1e2840d1f6cf326866b071462b7947fa5ca9d704c659dc1cafe0551d1bc79dd411aac5ed8507b89710b03726aaaa1b8f6ee553928136f2547cb50e
+EBUILD libfm-1.2.0.ebuild 3292 SHA256 c1edb49433975fd66419c3f9336f7cf034dbc3e3de80cd380c205353b811d391 SHA512 e2b3f5756140fc4b113dfb103dcab1343fe2c6d79524fd30fec8d9c78815e130c70b336d16dc7973ba15c26d345edc84faa2cff96ba09c8c3390ffe65539135a WHIRLPOOL 076fdabf7b0e56a2a1cd0eadb261a1cd49f666542e5c350004a7e179d0682799a4b0ccc0f566eb4e60adab4927e198232af07ebea2067c508ba1e1cc298115b2
+EBUILD libfm-9999.ebuild 3337 SHA256 cdb71d8c7e1b49bba041ec1660e65414a807a73fd7d77d3f44cba161a9b792ed SHA512 80be6687d5d28ab4faa1422d50775ad311e3803babf808f188e28c346b72dca4a7437a3a778766971b501be54f257583ae51a96ffbed6cc798df3f9ac856e453 WHIRLPOOL 5a459ca8b1555bea440c35dd94476762246c8017cb0b029a5c1e8d7c88a0375f3ce565d0e52e9ce973620f430f67c72b5abb7c3561cb06786831dc621351f515
+MISC ChangeLog 14620 SHA256 796c67ff8c5e00bb18425b7551853adc047373bbf68b092ddbcfd8de0cea532b SHA512 c2a886264675e414967a0530691da911ec99a999d97f83d5e057ae0b79f827e9d72b980cf19edd8d7880c8856126ecb05b680401c931714cd05d20369912c76b WHIRLPOOL 412d7bc250f6fdae49b191f22df4ffe58ea58f8a6567b0279182f5625c60ca54d443230dc9d0c3538f8db2015b6d58e8389a57fb9866d1492147f0f14a1bc204
 MISC metadata.xml 530 SHA256 c6ecddb0ae185f3438900090b4b05ec36b7f707f62075c94fe58ff98ad718270 SHA512 25c7bee3c83d7c76e423d72d2848e253b8e604bb76727ad6ce5ca51dcc904e0d0e1cd6afca04b55a6ff9cc0dee6516273f607512b80d5bf04af01a57f26a3c50 WHIRLPOOL ef86e0d6864d8e62215dcf162bde85e0a0ff091f038290e1715f2f33c5f385e81b08df84755b67e55939c0080c614d7c964a984fc816052320a2445ad7d2b26b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTHEoYAAoJEE8aJVXqcZkdN1UP/0mVZxdy5knhwc/ja/JMo1mz
-2KKF/emCvltm9pR8UczkhSwtD6gtYIRWi8tvMzHFS/daSz68RIlTroFKwfdW+i3n
-SijryrIEVDoczAFi3Vc5jTG/i2tWnW07lFIzB95jbMmj5fNR6IvE0xoEBzqA4736
-UXNDXpZBewpyKvqya+62nVvbZPPy6fj1e23Ltb14sMI/n2ziO1DRfSFZEGpg2kH7
-Fwrm4G3X8/A5yFKoCxEVh54vELHz9vf17u6/ckkCUXnxd3Nq1HpbO6NicHLtOayk
-gV9jfCn45rR8Jdzs2b1tg7A1Uv7Hkf24gRW9He3n08pjnWCgEuVKVyXb2HQyVKWh
-7X5V1RWMf0Q8mmVlzReivKmMJ3kWrJr7NRM0d5SgxUDN5zJurwyHpEJUI9Oa09k/
-evvkMPNMnio+OpjRyo0FcealBAWgwmXd4x/cyyZBZVIm5kp9kUjGtmlZNYHEKNhD
-YB1evmwFCVYe/IFiFBgr9ZLX/5jJAqXxunazFBGqz3jCDhqrlRLqoZe0s9IrhFz4
-baG/O2GZz4fEgQs7Ya3F1h7eRPmH683cQn44XXJMyoMUXXbG10I58xCWLP3rTTvX
-nOaZYJgEnYKp9mxjOX9yn1ZoT+PM1VBKHgNhHuQqr69PxfvZ1Fh6RBeiOimzKjto
-pGk5w1X0LBCFtEMFkKkG
-=g9fS
+iQJ8BAEBCABmBQJTJX2GXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
+OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88410P/05kHn7BkpRWwXFMq6RO/p5V
+thJMq6maZ/CdLZ3dw7uCyhpSgYuMvca+JdPMSE230hMVcrY+neGs2a8kpxYX4so/
+DJtSmqMklsllZ500hWpKZMbAj/BIp0J4WqHLJEUyyo9Sc6Fd9SXTlmj3EGYLwBFP
+nR7v9fAf8daFp/I/o4eFDsLawg1t4m8/H4Ukp1OCezuj8S09gj1sEir2AWi/RD4i
+ofJgqIot59RXV1nublZV8Bwu3Fv+Q9LDlIY137l0KG/V/6yoed2oHpHqc50fBLX7
+c5yvP8HSTsdhFt0Vj+Pu+4I8opnsSDExNxVZRDXBFF55PT4U4o4Rh8mcgcEXx35B
+S3lLovEceVudfNwYzlpWvsjPQeqZB1sHbHpsHhQEXs9jgLNyRdXbOmHesbImLxQp
+PJJ53ojOJ3D//3IHAN2eyJyc3VK9K3XlhnbQd2UIQ96sFKJe+7OlQzdqEx8vWbAh
+WdMSDBWh2TWeVfj2T0wUbztNjwRmgyC24jjSgnOwMO6xM9dElJnvbK55TkU1SLkT
+KYGA7H69uzKVk1wHckT4FFJByHEjMxqSkQRxyuDgWGRP0f/k2r3foqQLRMJo2y5n
+BfWy3tpgXUjTbS5h2A/OQ9P0aXIqsn5+N+27ew8OwhDORCvq4vUc4nOi3Zgzz2/l
+eTKvEs2i5hmV/+w1B4oN
+=zHPV
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/libfm/libfm-1.2.0.ebuild b/x11-libs/libfm/libfm-1.2.0.ebuild
index 5bdc098ddae4..f422bafc45da 100644
--- a/x11-libs/libfm/libfm-1.2.0.ebuild
+++ b/x11-libs/libfm/libfm-1.2.0.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/x11-libs/libfm/libfm-1.2.0.ebuild,v 1.1 2014/03/06 20:34:11 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libfm/libfm-1.2.0.ebuild,v 1.2 2014/03/16 10:32:42 hwoarang Exp $
 
 EAPI=5
 
@@ -21,6 +21,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.18:2
 	>=x11-libs/gtk+-2.16:2
 	>=lxde-base/menu-cache-0.3.2:="
 RDEPEND="${COMMON_DEPEND}
+	!lxde-base/lxshortcut
 	x11-misc/shared-mime-info
 	automount? (
 		udisks? ( || (
diff --git a/x11-libs/libfm/libfm-9999.ebuild b/x11-libs/libfm/libfm-9999.ebuild
index 97035555eea3..39b752e49c14 100644
--- a/x11-libs/libfm/libfm-9999.ebuild
+++ b/x11-libs/libfm/libfm-9999.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/x11-libs/libfm/libfm-9999.ebuild,v 1.39 2014/03/06 20:34:11 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libfm/libfm-9999.ebuild,v 1.40 2014/03/16 10:32:42 hwoarang Exp $
 
 EAPI=5
 
@@ -21,6 +21,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.18:2
 	>=x11-libs/gtk+-2.16:2
 	>=lxde-base/menu-cache-0.3.2:="
 RDEPEND="${COMMON_DEPEND}
+	!lxde-base/lxshortcut
 	x11-misc/shared-mime-info
 	automount? (
 		udisks? ( || (