diff options
| -rw-r--r-- | x11-libs/libfm/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-libs/libfm/libfm-1.1.4.ebuild | 5 | ||||
| -rw-r--r-- | x11-libs/libfm/libfm-9999.ebuild | 5 |
3 files changed, 9 insertions, 7 deletions
diff --git a/x11-libs/libfm/ChangeLog b/x11-libs/libfm/ChangeLog index 1549a887fabe..9bba31193dfc 100644 --- a/x11-libs/libfm/ChangeLog +++ b/x11-libs/libfm/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-libs/libfm # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/libfm/ChangeLog,v 1.89 2013/11/17 11:51:31 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libfm/ChangeLog,v 1.90 2013/12/10 19:08:00 hwoarang Exp $ + + 10 Dec 2013; Markos Chandras <hwoarang@gentoo.org> libfm-1.1.4.ebuild, + libfm-9999.ebuild: + Do not block lxde-base/lxshortcut. Bug #493844 17 Nov 2013; Markos Chandras <hwoarang@gentoo.org> libfm-9999.ebuild: Block lxde-base/lxshortcut to avoid file collisions diff --git a/x11-libs/libfm/libfm-1.1.4.ebuild b/x11-libs/libfm/libfm-1.1.4.ebuild index 91b2ad91b286..e31c0122232e 100644 --- a/x11-libs/libfm/libfm-1.1.4.ebuild +++ b/x11-libs/libfm/libfm-1.1.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/libfm/libfm-1.1.4.ebuild,v 1.1 2013/12/09 19:51:36 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libfm/libfm-1.1.4.ebuild,v 1.2 2013/12/10 19:08:00 hwoarang Exp $ EAPI=5 @@ -19,8 +19,7 @@ IUSE="debug doc examples vala" COMMON_DEPEND=">=dev-libs/glib-2.18:2 >=x11-libs/gtk+-2.16:2 - >=lxde-base/menu-cache-0.3.2:= - !lxde-base/lxshortcut" + >=lxde-base/menu-cache-0.3.2:=" RDEPEND="${COMMON_DEPEND} x11-misc/shared-mime-info || ( gnome-base/gvfs[udev,udisks] gnome-base/gvfs[udev,gdu] )" diff --git a/x11-libs/libfm/libfm-9999.ebuild b/x11-libs/libfm/libfm-9999.ebuild index fe92098edb3e..f574482d2c4b 100644 --- a/x11-libs/libfm/libfm-9999.ebuild +++ b/x11-libs/libfm/libfm-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 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.35 2013/12/09 19:51:36 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libfm/libfm-9999.ebuild,v 1.36 2013/12/10 19:08:00 hwoarang Exp $ EAPI=5 @@ -19,8 +19,7 @@ KEYWORDS="" COMMON_DEPEND=">=dev-libs/glib-2.18:2 >=x11-libs/gtk+-2.16:2 - >=lxde-base/menu-cache-0.3.2:= - !lxde-base/lxshortcut" + >=lxde-base/menu-cache-0.3.2:=" RDEPEND="${COMMON_DEPEND} x11-misc/shared-mime-info || ( gnome-base/gvfs[udev,udisks] gnome-base/gvfs[udev,gdu] )" |