Version bump. Bug #525516. Add gtk useflag per #517690. Rework gvfs deps

(Portage version: 2.2.14_rc1/cvs/Linux x86_64, signed Manifest commit with key 09BF4F54C2BA7F3C!)

3 files changed, 24 insertions, 20 deletions

diff --git a/x11-libs/libfm/ChangeLog b/x11-libs/libfm/ChangeLog
index da5840cdabd5..dc550722fd7c 100644
--- a/x11-libs/libfm/ChangeLog
+++ b/x11-libs/libfm/ChangeLog
@@ -1,6 +1,12 @@
 # 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.101 2014/09/06 08:41:06 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libfm/ChangeLog,v 1.102 2014/10/18 20:31:52 hwoarang Exp $
+
+*libfm-1.2.3 (18 Oct 2014)
+
+  18 Oct 2014; Markos Chandras <hwoarang@gentoo.org> +libfm-1.2.3.ebuild,
+  -libfm-1.2.0.ebuild, libfm-9999.ebuild:
+  Version bump. Bug #525516. Add gtk useflag per #517690. Rework gvfs deps
 
 *libfm-1.2.2.1 (06 Sep 2014)
 
diff --git a/x11-libs/libfm/libfm-1.2.0.ebuild b/x11-libs/libfm/libfm-1.2.3.ebuild
index f422bafc45da..3c9ab32fff99 100644
--- a/x11-libs/libfm/libfm-1.2.0.ebuild
+++ b/x11-libs/libfm/libfm-1.2.3.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.2 2014/03/16 10:32:42 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libfm/libfm-1.2.3.ebuild,v 1.1 2014/10/18 20:31:52 hwoarang Exp $
 
 EAPI=5
 
@@ -14,22 +14,20 @@ SRC_URI="http://dev.gentoo.org/~hwoarang/distfiles/${MY_P}.tar.xz"
 
 KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~x86 ~amd64-linux ~x86-linux"
 LICENSE="GPL-2"
-SLOT="0/4.0.0" #copy ABI_VERSION because it seems upstream change it randomly
-IUSE="+automount debug doc examples udisks vala"
+SLOT="0/4.3.0" #copy ABI_VERSION because it seems upstream change it randomly
+IUSE="+automount debug doc examples exif gtk udisks vala"
 
 COMMON_DEPEND=">=dev-libs/glib-2.18:2
-	>=x11-libs/gtk+-2.16:2
+	gtk? ( >=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? ( || (
-			gnome-base/gvfs[udev,udisks]
-			gnome-base/gvfs[udev,gdu]
-		) )
+		udisks? ( gnome-base/gvfs[udev,udisks] )
 		!udisks? ( gnome-base/gvfs[udev] )
-	)"
+	)
+	exif? ( media-libs/libexif )"
 DEPEND="${COMMON_DEPEND}
 	vala? ( $(vala_depend) )
 	doc? (
@@ -42,7 +40,7 @@ DEPEND="${COMMON_DEPEND}
 
 S="${WORKDIR}"/${MY_P}
 
-REQUIRED_USE="udisks? ( automount )"
+REQUIRED_USE="udisks? ( automount ) doc? ( gtk )"
 
 src_prepare() {
 	if ! use doc; then
@@ -83,9 +81,11 @@ src_configure() {
 		--disable-dependency-tracking \
 		--disable-static \
 		$(use_enable examples demo) \
+		$(use_enable exif) \
 		$(use_enable debug) \
 		$(use_enable udisks) \
 		$(use_enable vala actions) \
+		$(use_with gtk) \
 		$(use_enable doc gtk-doc) \
 		--with-html-dir=/usr/share/doc/${PF}/html
 }
diff --git a/x11-libs/libfm/libfm-9999.ebuild b/x11-libs/libfm/libfm-9999.ebuild
index 17ccd7fabef3..48097f4b98b9 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.41 2014/09/06 08:41:06 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libfm/libfm-9999.ebuild,v 1.42 2014/10/18 20:31:52 hwoarang Exp $
 
 EAPI=5
 
@@ -13,21 +13,18 @@ DESCRIPTION="A library for file management"
 HOMEPAGE="http://pcmanfm.sourceforge.net/"
 
 LICENSE="GPL-2"
-SLOT="0/4.2.0" #copy ABI_VERSION because it seems upstream change it randomly
-IUSE="+automount debug doc examples exif udisks vala"
+SLOT="0/4.3.0" #copy ABI_VERSION because it seems upstream change it randomly
+IUSE="+automount debug doc examples exif gtk udisks vala"
 KEYWORDS=""
 
 COMMON_DEPEND=">=dev-libs/glib-2.18:2
-	>=x11-libs/gtk+-2.16:2
+	gtk? ( >=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? ( || (
-			gnome-base/gvfs[udev,udisks]
-			gnome-base/gvfs[udev,gdu]
-		) )
+		udisks? ( gnome-base/gvfs[udev,udisks] )
 		!udisks? ( gnome-base/gvfs[udev] )
 	)
 	exif? ( media-libs/libexif )"
@@ -42,7 +39,7 @@ DEPEND="${COMMON_DEPEND}
 
 DOCS=( AUTHORS TODO )
 
-REQUIRED_USE="udisks? ( automount )"
+REQUIRED_USE="udisks? ( automount ) doc? ( gtk )"
 
 src_prepare() {
 	if ! use doc; then
@@ -90,6 +87,7 @@ src_configure() {
 		$(use_enable debug) \
 		$(use_enable udisks) \
 		$(use_enable vala actions) \
+		$(use_with gtk) \
 		$(use_enable doc gtk-doc) \
 		--with-html-dir=/usr/share/doc/${PF}/html
 }