Version bump for Gnome 3.10

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

4 files changed, 34 insertions, 29 deletions

diff --git a/gnome-base/gvfs/ChangeLog b/gnome-base/gvfs/ChangeLog
index 36a57b279f46..89259490e390 100644
--- a/gnome-base/gvfs/ChangeLog
+++ b/gnome-base/gvfs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-base/gvfs
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/ChangeLog,v 1.230 2013/12/08 18:36:55 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/ChangeLog,v 1.231 2013/12/24 16:38:26 pacho Exp $
+
+*gvfs-1.18.3 (24 Dec 2013)
+
+  24 Dec 2013; Pacho Ramos <pacho@gentoo.org> +gvfs-1.18.3.ebuild,
+  -gvfs-1.16.3-r1.ebuild, metadata.xml:
+  Version bump for Gnome 3.10
 
   08 Dec 2013; Pacho Ramos <pacho@gentoo.org> gvfs-1.16.4.ebuild:
   x86 stable, bug #478252
diff --git a/gnome-base/gvfs/Manifest b/gnome-base/gvfs/Manifest
index 9f5501071115..e2542b9dcaad 100644
--- a/gnome-base/gvfs/Manifest
+++ b/gnome-base/gvfs/Manifest
@@ -9,19 +9,19 @@ AUX gvfs-1.2.2-expose-archive-backend.patch 1607 SHA256 a6cd0f6b848e1943f9121cf4
 AUX gvfs-1.2.2-gphoto2-stricter-checks.patch 1127 SHA256 146349147b82721551ce717d892068d608b352fdabd40b969ec9c2b97595c062 SHA512 e3dbcfc257a5ce2ecebc2011317717d853f8069fbdca1c4bb81e90c79acbe3661f64c68321a1d209fdb3584e09efaf3c655d10b8a586f4a9be3d51d62ada9662 WHIRLPOOL 6c417af80339cee72de22c6ddf055057eefabc059c944a848283566ec20ef4785025b72d79537002254bd4a4675d68d892f7aea435b992245d5b22db689ebb97
 DIST gvfs-1.12.3.tar.xz 1361968 SHA256 38f69ec92083f86a51e7814e98d2861151f16dfb3abe4b3b39488408e12fd9c2 SHA512 1b2a2947447fa0917c64a69e02c84a1f870e88fb12c65169a86fd54165e5d4df671e324653ce1d1f123e03187f284e645ef6d4311000b9e88ac2aec055d48a58 WHIRLPOOL 07b21d6ddbb2388944e88af5057d5c027ea9cc4848e6901d74f428498cc4e87db4b80846ca2914802777c32b536bb220a7a8a3c0eae3a8e1f9373a032cd4511f
 DIST gvfs-1.14.2.tar.xz 1466384 SHA256 c3bbdac4bc89de82a2ba373799da80d24fb6a038a9893d9b54e2c9429c878fbc SHA512 f7f4fa2b69d51f087d0f5094c4a170363cad2cd86c6de94241bb4fd9adfcde48ee34c21f5e3e761ff13ba39d842f886dbabba5cecb466dcbae9a40c9b7976a58 WHIRLPOOL dff3f4fc334cb5f3ccd82260fd0feb7c57da8d588e5e9fd5ec5c8563dc52922fe58ff6ac3de85af94d7c7ff6d32acc85edb9def6db90130ef75681566222cde4
-DIST gvfs-1.16.3.tar.xz 1493048 SHA256 02a4483d0dd2e307f58f8e1d34dd29dbe06d3a345b73ac8d6f87bb91189c8e49 SHA512 2c7f9571ca0dfb642889fc1ece284a1473bd65d299700ce59e449fd23f1e06b68b5b36346b8176c5c23d967c857b8780f84127fddec5d7eaaa628b535742a083 WHIRLPOOL 43ad54116e0e52cb32a89b83acfafa24ee93c87e1405d478ed666a814c5227cf1de1a672c2b59fb4c7c08202ca9e140bdafd0f16508a02bbb1f367c00269a74c
 DIST gvfs-1.16.4.tar.xz 1497840 SHA256 903c6373955522c35acf07c610990812ed13e68ca514a42396cd2dba28b7580e SHA512 78662aa074f5d9c5e1f543d83adf06647507c1c4f04cdf3e8447ef9952055a0e5b11181cc1ce507b0f455fd70d24fd75acc7454dd60fd0c42242c6a3e37f0b06 WHIRLPOOL ec50f99e12915506403ef05dbf4851c539a3d6c4fa5087f215fc4ec96910e6fd35ae4ea9695fdc4cbd9ada7c959edc08aaaa3940f93fd98fa802e18951e2e1be
+DIST gvfs-1.18.3.tar.xz 1537320 SHA256 1d829716dcf1c5c016ee0c8aaff4cfd4fc4c719a4125f5c4f206f26c5bdc472c SHA512 1589c327de12c5186f1bc5ff48d9404062e2fcdbba266be44b4a71a52341cbd7de51aeecd41540d7ed73c2a21d789ce0d7ba83afa64a42b39753a66a3f81f911 WHIRLPOOL 7d35913ab3fea9dc1341b5e2f9dab3ed33f768e9f24e6ce78fbdad10ddafaae99531257941b445fd1540efb96f47cebd613a00baff18b5baa01509eaab3c5fa9
 DIST libgcrypt.m4.bz2 1526 SHA256 ce9d04f9cbd5417e4d4ba91095c06cea4852c70d75716311e82dfc243d2f0128 SHA512 fe7916d01efb1d14c4d84ed37f3b53b04d3b005cb04b603bded8d24e147fe69a4c0823164483dba3bc95cf540eaf93a0c0ad59f29f8e1edbae9566a81be5900d WHIRLPOOL 6baa8ed005a691fb1f31ac420d801d20a1611519a38749718dcf3956557f40a058c24b988d20534a62084fadd4141c44893cfa751ebf8011cf55d83c759868dd
 EBUILD gvfs-1.12.3-r1.ebuild 3361 SHA256 d7dec2b44edda8d1f96026583b737539b328dc6aee9a99e50b3f2d87ffdede9c SHA512 ebdd5ed06ad17c47666d51d993ff7d5b00ba42335756f2ad75ab0962d0e3174d6472439171221f7e5442b98a8ac7a70610c1d54dd09d6eb06d7d4a03f1047116 WHIRLPOOL 4a59239fed3d82ad2940547584e64d4e41229edfb54e7984177529939fa19b4af8ac76b130d2637e5178028e4be8530a635cf19035e9bf4b6b5c970369328c74
 EBUILD gvfs-1.14.2.ebuild 3892 SHA256 52e230bca241324cb5344dcb132135f548ae6e6b1e65d8ecd34d7aa03c3750cd SHA512 2edeeeeda29d48b73249883ca89ce078e187be1204475d545e4ba5f5b4d4c0aee64a5e042bc5bc8f7a9d4c13431de5efaf39ee34f04867c963520785810c6cf4 WHIRLPOOL f856ba9fa3f566bda49e70172e842a019c741d5b90e09cb8b8ebb45ed69d5c5e2d009df21c850758d9127b0dcde97f8f7b1b7c77d487b4e9c940f146d4f6410e
-EBUILD gvfs-1.16.3-r1.ebuild 3746 SHA256 e45a6d426f58216d103506781c3e3bd3438d82fce2657687e1889a37be6e00af SHA512 a6f4ed9e8204a80ba3020ec8df5e09ee7bf9934929d2d7ff3ff843bf73495c34be462c97e5300b34f6a6f7ed98eb38ec9f1445c4258f5f58dcedd195677b07b1 WHIRLPOOL 04a4d923bed97af72d34a3eea0c9c73f5a9d748c43a290e1cce87fac29ec9240c67988e187eb8e19ec61f4e48fa1f90f5f78e522c5f77c0ffb749812cddaf672
 EBUILD gvfs-1.16.4.ebuild 3651 SHA256 3b37b28ab2a7825c505fea30c2d2fcc7a36531047a7fd5f9b068025a485bf79f SHA512 a06cc436c8f4b2433d958d40d699ba9f5d09dd52c369b9e7f5af95a9e4005d1db160d9c0e5d16cda61a3490af82f765207d9e29800b9ab956f64c3d18cb46dda WHIRLPOOL bc820568d1431df0481ba01492dfcb4650cd9fc3dd8a5c5b8ea6e54881730ce63e9ab3c439c69923352eb5755072e3b24bbcc6e459aa9f4789040a068edb444a
-MISC ChangeLog 32902 SHA256 36e1ff5c2eb6294c7920d23d46d63e5e449dea8f235120136caf5b9890accdea SHA512 80a3dcbf8576e35b686cf853be1e665e7c9b3deac700c794c16932c236c84f663c044764201dd21530887c071adcaef63c3d11c3db70539724015846f5682202 WHIRLPOOL eedb3ba06f904c707c1b6b0b370d2d5aceb191aa824ada970cb28aef3c3d0c6e728723fba70369303eef48e235d12b7e93646a9759f1bb8171d3b79781263794
-MISC metadata.xml 1440 SHA256 a02bc760008f281e624b5bb457002578368cbd4a6cd6c0022a8e6e7e7dda9603 SHA512 93e1c99b3108f240d9543a22c9ef67a1ab6baaa25d99bbe721d6fcba7e939b40bacabe727310d2ecda1200e3612c88a7245c55dfb2a3e25ef5afc20b69b59863 WHIRLPOOL 6c3357fadeba19ff338ece726468464973b74a37b40aeba8925ccf6eba41b46d8e2c62bfca58d4b7f83138df248cd4c0ccee418b66ab374d8eef045ba21d0717
+EBUILD gvfs-1.18.3.ebuild 3667 SHA256 498d8c9b63f11dd67e979ec1f3db6ab2329422317e427f55c92011d666ef87ed SHA512 e53629abfc813413cf357c99e1d124a714c8cd104ca90a9c7a52a44a7b8d33dfc99aeae150b60583ed7cfb984bf12a1f1228e28084883e0de5179b15e37294f2 WHIRLPOOL 00cdc8951abf31f4449508c79d6447e05155a76d078a595c764d67e133a537287c0671e041c83fe7c0b863c3604ea01fcc53b9477976e16f1ecd5a96d445d728
+MISC ChangeLog 33068 SHA256 8a1d79cc6c570faaf1bc3112520daeb8595b6c63264c609dda7ffb847fe32fc4 SHA512 cf14f019c1f39ed86d36eb60c86d47778d1b210709f5fcfd3b1ac7a22eb881e507753c9c56627251d75fd8911efbfee7b79a62795e8875be951f2132f9075f4d WHIRLPOOL 2bd43429b30a5251eca0b108c9b4e5c27477fdfb81d4bc07c76a287944818935f89cd60d51b4e3edc54db4ada1aeb7610130ab93d53cbdd61732af5283435920
+MISC metadata.xml 1547 SHA256 5f05c22a706de39194219216cb6bbfe608656517126829067ebc3ff37fb2b4e5 SHA512 6e880b69df0c6a245645bcf00ba56d635a40deaecbe510c074982e976c942285e32abe334675333f375020eae8cc82134a72c7ba93afc8e03117c4975478def3 WHIRLPOOL 70c0ac42a95015c9d69fe39655a0110a7f396c3d407f867ab41bc0eb3520f5b906683b9cfb0e0ddb978dda7a330ba20c2ded504700aeb98b04511cd7a4622cee
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlKkvEgACgkQCaWpQKGI+9SjLgCeOF8g3WNtmjDkZe0UBnwrEsJU
-C44AnjWS8EpNH2fW+rhJiqppp7Klk1Jh
-=R/aD
+iEYEAREIAAYFAlK5uIMACgkQCaWpQKGI+9TsiQCfYVNthqRLsNKQke3XFxik3s8M
+f88An2UI5UxQBZuheLIKIaBusVnVC2kd
+=rMz6
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gvfs/gvfs-1.16.3-r1.ebuild b/gnome-base/gvfs/gvfs-1.18.3.ebuild
index 7bea24dff771..bed9f4e87ffc 100644
--- a/gnome-base/gvfs/gvfs-1.16.3-r1.ebuild
+++ b/gnome-base/gvfs/gvfs-1.18.3.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/gnome-base/gvfs/gvfs-1.16.3-r1.ebuild,v 1.1 2013/10/14 19:26:28 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-1.18.3.ebuild,v 1.1 2013/12/24 16:38:26 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -14,13 +14,17 @@ HOMEPAGE="https://git.gnome.org/browse/gvfs"
 LICENSE="LGPL-2+"
 SLOT="0"
 
+IUSE="afp archive avahi bluetooth bluray cdda fuse gdu gnome-online-accounts gphoto2 gtk +http ios libsecret mtp samba systemd test +udev udisks"
+REQUIRED_USE="
+	cdda? ( udev )
+	udisks? ( udev )
+	systemd? ( udisks )
+"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 
-IUSE="afp archive avahi bluetooth bluray cdda fuse gdu gnome-keyring gnome-online-accounts gphoto2 gtk +http mtp ios samba systemd test +udev udisks"
-
 # Can use libgphoto-2.5.0 as well. Automagic detection.
 RDEPEND="
-	>=dev-libs/glib-2.35:2
+	>=dev-libs/glib-2.37:2
 	sys-apps/dbus
 	dev-libs/libxml2:2
 	net-misc/openssh
@@ -38,21 +42,21 @@ RDEPEND="
 		>=gnome-base/libgdu-3.0.2
 		=sys-apps/gnome-disk-utility-3.0.2-r300
 		=sys-apps/gnome-disk-utility-3.0.2-r200 ) )
-	gnome-keyring? ( app-crypt/libsecret )
+	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.7.1 )
 	gphoto2? ( >=media-libs/libgphoto2-2.4.7:= )
 	gtk? ( >=x11-libs/gtk+-3.0:3 )
-	http? ( >=net-libs/libsoup-gnome-2.34.0:2.4 )
+	http? ( >=net-libs/libsoup-gnome-2.34:2.4 )
 	ios? (
-		>=app-pda/libimobiledevice-1.1.0:=
+		>=app-pda/libimobiledevice-1.1.5:=
 		>=app-pda/libplist-1:= )
-	mtp? ( >=media-libs/libmtp-1.1.5 )
-	samba? ( >=net-fs/samba-3.4.6[smbclient] )
+	libsecret? ( app-crypt/libsecret )
+	mtp? ( >=media-libs/libmtp-1.1.6 )
+	samba? ( || ( >=net-fs/samba-3.4.6[smbclient] >=net-fs/samba-4[client] ) )
 	systemd? ( sys-apps/systemd )
 	udev? (
 		cdda? ( || ( dev-libs/libcdio-paranoia <dev-libs/libcdio-0.90[-minimal] ) )
 		virtual/udev[gudev] )
 	udisks? ( >=sys-fs/udisks-1.97:2 )
-	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.7.1 )
 "
 DEPEND="${RDEPEND}
 	dev-libs/libxslt
@@ -62,7 +66,9 @@ DEPEND="${RDEPEND}
 	dev-util/gtk-doc-am
 	test? (
 		>=dev-python/twisted-core-12.3.0
-		net-analyzer/netcat )
+		|| (
+			net-analyzer/netcat
+			net-analyzer/netcat6 ) )
 	!udev? ( >=dev-libs/libgcrypt-1.2.2 )
 "
 # libgcrypt.m4, provided by libgcrypt, needed for eautoreconf, bug #399043
@@ -72,18 +78,9 @@ DEPEND="${RDEPEND}
 # https://bugzilla.gnome.org/700162
 RESTRICT="test"
 
-REQUIRED_USE="
-	cdda? ( udev )
-	udisks? ( udev )
-	systemd? ( udisks )
-"
-
 src_prepare() {
 	DOCS="AUTHORS ChangeLog NEWS MAINTAINERS README TODO" # ChangeLog.pre-1.2 README.commits
 
-	# Emit signal before returning dbus value, bug #488024 (from 'master')
-	epatch "${FILESDIR}/${PN}-1.16.3-emit-signal.patch"
-
 	if ! use udev; then
 		sed -e 's/gvfsd-burn/ /' \
 			-e 's/burn.mount.in/ /' \
@@ -119,7 +116,7 @@ src_configure() {
 		$(use_enable udev) \
 		$(use_enable udev gudev) \
 		$(use_enable http) \
-		$(use_enable gnome-keyring keyring) \
+		$(use_enable libsecret keyring) \
 		$(use_enable samba) \
 		$(use_enable systemd libsystemd-login) \
 		$(use_enable udisks udisks2)
diff --git a/gnome-base/gvfs/metadata.xml b/gnome-base/gvfs/metadata.xml
index b1167dd91dbf..3a6970fdbee8 100644
--- a/gnome-base/gvfs/metadata.xml
+++ b/gnome-base/gvfs/metadata.xml
@@ -20,6 +20,8 @@ applications not using gio to access the gvfs filesystems.
 	<flag name="gdu">Enable <pkg>sys-apps/gnome-disk-utility</pkg> integration</flag>
 	<flag name="gnome-online-accounts">Enable configuration panel for <pkg>net-libs/gnome-online-accounts</pkg> accounts</flag>
 	<flag name="http">Enable the HTTP/DAV backend using <pkg>net-libs/libsoup-gnome</pkg></flag>
+	<flag name="libsecret">Enable <pkg>app-crypt/libsecret</pkg> support
+		to store login credentials.</flag>
 	<flag name="udev">Enable udev base replacement code for cdda feature</flag>
 	<flag name="udisks">Enable volume monitoring using <pkg>sys-fs/udisks</pkg></flag>
 </use>