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

Package-Manager: portage-2.2.14_rc1/cvs/Linux x86_64
Manifest-Sign-Key: 0x09BF4F54C2BA7F3C!

4 files changed, 42 insertions, 38 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/Manifest b/x11-libs/libfm/Manifest
index c06e5ddab68f..1f3f68d84683 100644
--- a/x11-libs/libfm/Manifest
+++ b/x11-libs/libfm/Manifest
@@ -4,31 +4,31 @@ Hash: SHA256
 AUX libfm-0.1.17-ssp-fix.patch 908 SHA256 f8fb5e8f6a712de882151f50a9a23d002b8719da5dff8be33a92cfea7c93b85e SHA512 2e7701bf501bdef33a2c91fa5d9bc9fbcb1edcbf7ced323fd6d499cc1971b75fafdc0ba57b538bff1ebb4d5ed65776cdef18962cdaec6a43ebb4aa8178facecd WHIRLPOOL d2056cd5984577a031e11fba9275a040f2c29ed3a49d624a7ea3d0b425ba16b3bdcfaf963117dda7b79beb1ab75822e492d2bd3885d4dda6f39e6fbbe8ef4268
 DIST libfm-0.1.17.tar.gz 874556 SHA256 1740681cff4cd4c5a2eaa9805d8898269cfb6a49a0bda0acb242def15bc7131b SHA512 83d62e78c68f5a212dc464774f4ac9a965f58741b9cc31bf6599c7304e0fde668edd99e33a2f9d19d2c342483d92ed36031c388c92c858c55217e47b5c8ba044 WHIRLPOOL c55471431e4130cf96412cf4943e993954139c319dd5434f1d718d9c0609a12bde3dbb8e43b889bb4cefd300e5073b59b4b8fe6eeb732d87d52d8a9d536733b4
 DIST libfm-1.1.4.tar.xz 699080 SHA256 8512c22b89d11e9c0f6044feeb72a96ac542116012c29cc8dbc287476223ee60 SHA512 66d586703a47e537a4f0b3c077facdc22df5226bc4f6462d4f01c1f95af00ccc6d39f49b08a92976b4f53cc42aef282bb16044c29049f0a415ac9f46426ec94c WHIRLPOOL ec9176418be358ba2f9706e41b8eab6496cb9ccea4c431b1f7aad0d64ff1c97249c4da5b6acacf58956cb54b22920bdc659d1ff462bfdb17ec438cdc4957b644
-DIST libfm-1.2.0.tar.xz 890064 SHA256 f0513484e43dcc576097508b7d666f7eb72530963e5a21692034a7ea6a6efc22 SHA512 a62d3b8a26bf52c058f49e9b5328409f32189c708c0de8f419e7946e0be19f2d5dad604a214381b98bf1b26a81e85f60bced8b29b40bbfeb7e1c0aee4d1e36f2 WHIRLPOOL b78c4ad2b36b2729d520bde2da32543abf2a3fa043057fd71c80c0f744abbf39092da6b15e34dc8c7ca8e9237b8df4d55a7f367cba6115179ec6c1c78985e129
 DIST libfm-1.2.2.1.tar.xz 894092 SHA256 dbb0a3f7fd9615cccf4ad8ed1a07591535712d00eede03e5bd564090b33a4329 SHA512 fcbd89748c033a7d237462081cac5d1c2d7c11167f06674f766ef7f74590e7f35e5828c5a5056c31d30b4d50aedf5cb0dd1c2811d8d7b9a432af2e51a6d545d1 WHIRLPOOL 2bf2f7a717d11537bd0c5e477c73ed010cf4ae3e6dc8e4317db62a8a55f356026d87dda801512c4af6605258fb4b7509e5f2dbe3de7105af97fea33e18a7d20c
+DIST libfm-1.2.3.tar.xz 898256 SHA256 c692f1624a4cbc8d1dd55f3b3f3369fbf5d26f63a916e2c295230b2344e1fbf9 SHA512 f4c214daffc47f05ba31c65203ab0542a03f5a246ea4bb62b6b365ac3fa120a1a51e37b00f8a43afe56875eb69f9be327ac724dafb6fc2de13aa77deea23f443 WHIRLPOOL ae5354c5ef5154ebce8a9124b47e0a645171d50d4034fd1e6000ff084acc15261398029c58b067b9027d4ba68d36d8addf91a28678c91a3fbd9ce0806e9b6046
 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 3292 SHA256 c1edb49433975fd66419c3f9336f7cf034dbc3e3de80cd380c205353b811d391 SHA512 e2b3f5756140fc4b113dfb103dcab1343fe2c6d79524fd30fec8d9c78815e130c70b336d16dc7973ba15c26d345edc84faa2cff96ba09c8c3390ffe65539135a WHIRLPOOL 076fdabf7b0e56a2a1cd0eadb261a1cd49f666542e5c350004a7e179d0682799a4b0ccc0f566eb4e60adab4927e198232af07ebea2067c508ba1e1cc298115b2
 EBUILD libfm-1.2.2.1.ebuild 3352 SHA256 4a1650ca297973ae994b1ed690745723777415dad985e90b522c0c3a70d118f0 SHA512 d03e54d1423f48a031a2360ccf751a4d31563d0be1dd956b8b1de2efa5001f0405cc3e1dce46066847157a3d4e78c77b76452cefcce63e9c5e822eecb59c0fcb WHIRLPOOL 9a78ba733a39c9a2013ac40151f31501fdb921b538318dd35b5bb72ec33945cf8fdfc17f414f26ba0689fe5761fb1dc7e70b396aaf871041d59d39b6c6a2b69d
-EBUILD libfm-9999.ebuild 3395 SHA256 f0d647d260e64dac633c76cfb04dc81860a0bb7062a95907f711dfb435137c5c SHA512 550626fa38e1f9b27d611d4e5a1ca67d3c2723f5da3e341cf77b6d2e7beddc614adab1799eda24afa83055577b4a38d8e93bce3656f37c633b7e4926d640bbe1 WHIRLPOOL 8aebf97c65c6b2c3b797ce80d050d703908880c317bc45cae746feb351f2f0b257284110c0b9e7fbab6b13f5c88d7f8b1199fe285a58995385ade4b11aa65b28
-MISC ChangeLog 14776 SHA256 e0dc10683a074236c12f648724162110448f33a4c92014f2093f8ce49b379ae4 SHA512 c31d0c9e9e8afc28ed2294f6825ca72e5e6fe28792d9ce76fc598614b643daff20806ee3094d463b5b14f0da6c7bf316eefab3e76e1830df0ff5c8c46cc51748 WHIRLPOOL c0fd518616684c13f1130e2ce4aa2ce8769b191f54b299a4c4fe241a81bd1a36273dcfc78a68fc931f79e44d24c3044a70cda167d139da17e4731a662b5fa243
+EBUILD libfm-1.2.3.ebuild 3355 SHA256 f6379ef3d8f07a26d5c0547d03e805b516c936bafd16a1c0511be2d0e4a62446 SHA512 256ec6244d4473472fecdffac4beb7b697f4a452eebe875fd4651654a035911d2790d8c776b813fe3d96d2a0d6f8984ac6b8be395c60b5923c1f765858997893 WHIRLPOOL 61117480fa9c7026b27547b1c7faa98fef9d58c90ad2caa76fb5199434fac555b8b8d82ee5876072ad2b50176e98800df36261fad0ac64362ccd22d7e92c9414
+EBUILD libfm-9999.ebuild 3400 SHA256 365a23bfab8f2081b000c7548c1823a9b3547c735bf103cdc9cda2fb909907fc SHA512 f3f6a0b5ae141ad4862c211d6a491bdb38c575b3f58819ee59f9f21d8f1ea84cd125d92a5507df4e3f435437a9644909d550666d67545f6d2d8252b1edd42238 WHIRLPOOL 3c7a7f49ab323cbd3f41038d3912054e766adddfdfe49948222b0d3bafc4adf2d6008817b602cb6c791e30eab9cf70bca0b07f5656e1e8ef56293b16765d2f9c
+MISC ChangeLog 14996 SHA256 6866cb96930b79044f6fc6657a6ed4765ec6ce33dfe8bd5bbad6522dbb4fb2a1 SHA512 1fa8bd74f6a2e0b990c07fbbfcc52740ba3af26d5520c594d97555131c31106d61d6b329b2ecee93ce78b28aaa35c19c3155324dc0a60b66a9d1c0adee2bffaf WHIRLPOOL 21d018a0d2b6dc1db64c2f1a46f0342b6107fed54158c08c3bf388436c668034ca1935c369efd4867b90a2dec2e38f9a718e1610b549bf6d51e9574ea131ce73
 MISC metadata.xml 530 SHA256 c6ecddb0ae185f3438900090b4b05ec36b7f707f62075c94fe58ff98ad718270 SHA512 25c7bee3c83d7c76e423d72d2848e253b8e604bb76727ad6ce5ca51dcc904e0d0e1cd6afca04b55a6ff9cc0dee6516273f607512b80d5bf04af01a57f26a3c50 WHIRLPOOL ef86e0d6864d8e62215dcf162bde85e0a0ff091f038290e1715f2f33c5f385e81b08df84755b67e55939c0080c614d7c964a984fc816052320a2445ad7d2b26b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJUCsijXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJUQs45XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
-OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88sBUP/iwfTdTh+VoqtLlDSOfb5/Ga
-ShLuXLeyCCGUy2+Oabe2MqOQVGHtaYset6UaXorAb9AA9wifjxGYge9QWvckZjhX
-kjCe7iZZCGEm7jtqRa6per8Ro0MajE/HXWlVV6jVnHWjMeHOEl2P3X9oKwRLCkV0
-vl0c5z4hSs2qsWmgdxMXigFPg29kNge/daNANHyPv0YLSPQo5RP+qzMgvYUb/lQy
-TTqBNr15EXPQoaRzB3VcFKHvXnjvdpyRX50LeS+XffsQugv3IYu0TLILY8ONO7th
-JE2IcY+76NjKyn47K0eAsJ5T6PA0Arv/7KB7LrWjElOy4UFxI5dALDjb2Or4yY08
-OfstoKqo2b0RFolWt4q2C6naw6slGkTODzJEgCdXq4xVHer09WUWBYufgJ0I4q44
-1s5p7KKg5GnLgQLt1H3NGFL3A+8ixHIesNAX6jEUc11WX7Eg3q9cmV76tLx6CarT
-mycgLTfB3cv1gtAsr03nRBVQClRFE3H4ExlWNlJf2pV/WpY1JELJ2kfj+RyjqwnN
-Lox3h4Lj7mQqTH+e7WFDA+kwzLW6NXJYfSI4vyIhhtEddQ21puZQSM+7fFR8iTW9
-cA0LyHusgTV/6hLQaektVhqfYDNZ28GQI/K8DcuaIavgq5l5tIrtGksUJxAR2Qvk
-QpmixlM2NNtccAYAIDzS
-=1E9O
+OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88tt4P/iN+4Hs6kQamJbT3XZl6meCp
+9TGcwQYLcw8MhpwGwmHUFYThQgs6CEfV3o9K7/c9XJ33STPQ8Go62VwoaRinqgFs
+nkyqjIlhA/Nm5qIICML4RRB4Brb2VMoVCS/IOgEGRBW/6XyA9tHqCxjbtXlSlvWd
+IMJZXI1qVwwuBBITa6x6Ktay4UkP25H0IWHlFb9vG1MyMDi8upYb+jmWQ7gxe302
+YEA+almg21UY6LLIaWdhKqdWaZQlg4Oy/4axu/09Z37HWtjS/7Ps3zYe4tZ+XRvn
+Ytm00p64nbzfNnFOfl8jOMdKVFhzgWT912TWyk9rxGJifpR+zWZlEOJospmagwAj
+Jrjmm++XtUy9GnERpTpU9HrvumvhH/5W9beqPYDEUe0UTgDxC3YQgVwVeqMnzvra
+q0QUq/Ja9pecHS/uYUICk+x4CfK4b86yt5P4VTDm8XJ8PCpbJ6WitWyEhDK9htQ4
+ERlBVU05s8nyoeJLZg4R4SSRHPhxToMfz3IVwhS3TxgQyTyGgSdlK62q4pdmS0Ti
+OulCMZNds9/86zx4V4kbpGQQo7nn+voTCcZlSGy62Ksm3piccuR92thV+KrgW2Ea
+zyDMwOAkipJyrLEVrmkYRlXqTYjj2+TMd1JtOSzeRfYpAlfx15bh6rsZ65zQMx2j
+Z2Tc6rbJWapfu9HHHGzT
+=5J6b
 -----END PGP SIGNATURE-----
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
 }