Version bump for Gnome 3.10

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

29 files changed, 173 insertions, 455 deletions

diff --git a/gnome-base/gnome-desktop/ChangeLog b/gnome-base/gnome-desktop/ChangeLog
index 5c9060fbdbb1..da78b7f0c378 100644
--- a/gnome-base/gnome-desktop/ChangeLog
+++ b/gnome-base/gnome-desktop/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-base/gnome-desktop
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-desktop/ChangeLog,v 1.319 2013/12/08 18:28:37 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-desktop/ChangeLog,v 1.320 2013/12/24 16:29:43 pacho Exp $
+
+*gnome-desktop-3.10.2 (24 Dec 2013)
+
+  24 Dec 2013; Pacho Ramos <pacho@gentoo.org> +gnome-desktop-3.10.2.ebuild,
+  -gnome-desktop-2.32.1-r1.ebuild, -gnome-desktop-3.8.2.ebuild,
+  -gnome-desktop-3.8.3.ebuild:
+  Version bump for Gnome 3.10
 
   08 Dec 2013; Pacho Ramos <pacho@gentoo.org> gnome-desktop-2.32.1-r2.ebuild,
   gnome-desktop-3.8.4.ebuild:
diff --git a/gnome-base/gnome-desktop/Manifest b/gnome-base/gnome-desktop/Manifest
index b9371630834e..519388890d39 100644
--- a/gnome-base/gnome-desktop/Manifest
+++ b/gnome-base/gnome-desktop/Manifest
@@ -4,23 +4,20 @@ Hash: SHA256
 AUX gnome-desktop-2.32.1-gold.patch 493 SHA256 6c7391376054199bfd57532e642c89b8a18396e12c79417549926e0b7e76bba6 SHA512 1ceb79f150cc271547766044277cb38c45cb8ebaab9edaf5fd7bfc29ed25920c80d4a0331fdc6ed91f5b47cb51d820270714d72d3bec7cd55939f1a1ef7a9c0b WHIRLPOOL 2ade696dfb67f6e12c4db3c1d82d85a22177a56eace8266ffc40d184e3c923c0b6c0d029a2733e783d8d012913cefd1e13feb2fc0a7b5f74dc75794ca84d4408
 AUX gnome-desktop-2.32.1-thumbnails.patch 3530 SHA256 3a2294ff8f8082d3be9d709efbc4757c518cbad57980cdc7f4efeef366a756bb SHA512 8683aae51ba9a97074442b226d24267857d64a911608fc1c8a207fadc69222583c26281d4c16dddfbf7c975eb76fc6d5c08291ff594468dbee6dd92ef0313263 WHIRLPOOL cb09db77b55cc34ed6a74babdeb0a71b7a3c8de0c3897615bf8a6dc3b037d5dfd4a56084a913855e5b97a0c12375c1c7941435d8e5385c0a683a5533983e8030
 DIST gnome-desktop-2.32.1.tar.bz2 1633847 SHA256 55cbecf67efe1fa1e57ac966520a7c46d799c8ba3c652a1219f60cafccb3739d SHA512 b8084d08366dab661a7ee369cd03ba62beddbdfa9a36b988b7d13d207b33d6916f7fa8691717fba7b6a70d8276779e35360b1dc385e6ec876f30ea7b8b373c28 WHIRLPOOL 0889e79b1b3956b0ef1330f661676b77bdb40e8110657ea7f4035618ea023fc4b35364629d68741f042c0b971db9fa4c7731065717612486f7546e07fe048a0d
+DIST gnome-desktop-3.10.2.tar.xz 1062876 SHA256 d4f5944aea5f2a8c7c5dc0e738bf07f293dfff81ddc55a53d661370bf24e4632 SHA512 0a45dc718b269c29984e7ea073152678fe88f35d4a0ea29821add96dc44eccf987f2eb526a045c8c4d9c75daac7694f3f3e7e54d3c52901f375914365a0f1091 WHIRLPOOL eb8ec2dea008427beb8ac84607f5779ec5b28787f3c243744f822549c65f30ec0eb43f923d9f8e0967804f7c6f01bfe7b52da12cd3b17f6197581816954d2d41
 DIST gnome-desktop-3.6.3.tar.xz 969112 SHA256 4ba7e7db2a65e2cc867e885afa78e29d9a73cfbfc3bed91786198c486a6d1d0e SHA512 801960ab77c58e545cbabd73b3e1727e62c1254d0aa43da621f2a00f173a4ef827f0a846f15f96da209ee88c6a6296f2e827c0c04cf6addffc6b0b159b9e2a66 WHIRLPOOL 2d1a2d538adde84a56ca1edecde47db1160c388fbd3a0319ae169f4ddc854429854e26cf787e6e37ce3d28de380e5f203eed2a7b80df121aff17dd614ac09aaa
-DIST gnome-desktop-3.8.2.tar.xz 1010336 SHA256 af4ec330fa61ee761daf2d5e481e2f9ffbd068d135d5e31a3eaf274524cba33d SHA512 6ea9154692d2a5d5b959a2c172f91c08554b72fb12f8e92a97511978804557a7e28ac743ae6dfd2ae7029f02dc905dfafb21a5177c01cc0051a17290b21aab97 WHIRLPOOL a2caea4ff1c7259dc8a7e7933d15dbac9e23bf79d893533e61c917c7154f02c0a0dc2f94da41d85cde2e4b91e5a0a94efa01af9e3da85d12788f4424af4564f9
-DIST gnome-desktop-3.8.3.tar.xz 1030240 SHA256 c9c8d1888e28cb30e466be46909efe640fb3cb348909cae2664489508790e5a2 SHA512 f6849c1286b3fc86d94be5955bd18246aa4c2102045b3102f44dbb90c7819f71382cdd3f6330db33d5fff01a438987bb0957f743a05df1c61503f4776c192317 WHIRLPOOL 7fe90a46dcc44f99f24c6f4294959e92c547b3f54ce1affed7c99bd1988b0380a4b4e9cb797d0c049723d3dbfddd34ecc7b6d779cc4f339f239e29f95f37a486
 DIST gnome-desktop-3.8.4.tar.xz 1043120 SHA256 2aa1d4c5b78b018368e1cf9cd3568555dd6b04ad68536b9f338b28ac0f89df9f SHA512 e5932bd73f0be85b79dc63af1766633c56044078313ea764a7faabaaabb52af8ffcc59361a0d65509626fa83c6afcc2ac1fb4e64b49ad06d220994dcfc10c31d WHIRLPOOL 91f46a68313cb1073e9accd233c141356570cc5687cb4ee1ee53e003c778bd7b254d1554457e430d42cc607e079c4009a5cddd75b7ac9ac5df6c2869a0d3e185
-EBUILD gnome-desktop-2.32.1-r1.ebuild 2022 SHA256 162cbc3b81f63fb0725345b28f5800959aa39f62774928705ca324d2e50fff5b SHA512 b54d5a353e8aeb58fb89ac30c6a6868930ddf77071bca15346a7bac983add40fcd2e20a5be86dd2456edd7cd3ee0992d919f28325428f1aade68d2eb88d2e54e WHIRLPOOL b41e55b7cc1d6ee34f2ef2da47c39da192089711186eb65eebca7aa9a116a5c64b3306178f0590bb551dd82fe1adfee6f6d00bef864414a29e83766d3cf12de8
 EBUILD gnome-desktop-2.32.1-r2.ebuild 2435 SHA256 e4c200e0a60b8ec413551cadba331c21ff97ed91c8bfa0e38fdd4b2abca4e7c6 SHA512 b176b84162873aa82c323f9b5db796e9de1d3790167d95806b53727d747681ad493d14902e502b5623e1ae179ef522a6075d11eb4b7e5a1d257afbb1fd19a6fb WHIRLPOOL 5e28b0d15a8290d64281c42021c88cee0b284cfa5fdbfc616ccc5202731cd0c9132c560dbdb5c0fd7d9329531164f8e00b855836a00d31ca9e665bf16f69e1f3
 EBUILD gnome-desktop-2.32.1.ebuild 1678 SHA256 dd140c9a7ebadffbd846cdcf12063a90ab242a64834d34b0a8d3eeb90f531b6f SHA512 4f940e58e2863bdf8d0ad04cfdeb2f9bfbeb1ec79fc060e6e5b51fca0502d646f5fd8adc3647bd2dcc7ff345a2f3becc13613e32d534ed38fc78b0882e9fd7bf WHIRLPOOL 316bc8030374b6f6e6361af286c790b6fca3f42b7f470241ac6ee1614858aa97d3926a057fd764dfec700c347db65207799d29765ab8178a7f1a7f8c480640c6
+EBUILD gnome-desktop-3.10.2.ebuild 2030 SHA256 44ba429db43b879fafa42a12a31004884838c6682e5485276cde611e4364382b SHA512 2073f2ef63e1b93a05618cdee5a0ec3939716155adce2031b23826f762267bbc866e28c8b8fe9c9d2d604a964dc55ff3d90d0940d7700bc45b97a7f1eac42ced WHIRLPOOL 12857c348933e889152ba4ce870c94c03886f2ebc6b5874c36793b7507d00c2329f621ceb5971c07e04446914bfd004ddeefd7699fbbdf1ba311e559ea859ea8
 EBUILD gnome-desktop-3.6.3.ebuild 1990 SHA256 23f2c88277ef85c745d46145ffd9fc1718673667bd8c56de8d0506a9d4b5200e SHA512 fcc1578d2af9156a4c9bd45d08161daf7ad97eebd67cbf2aab2c76109641e36f2af130e5090859ee4493dc957480ccc48a131b25b7c06ff989ab1a54d6da10cd WHIRLPOOL 70e05c33ca531ca874148f34549299f7253b7ab351ebd9588014774492399af6dc7efb8a7d44557695de766801853b0d9831b0a96e40687b3f9b75526baa1479
-EBUILD gnome-desktop-3.8.2.ebuild 2029 SHA256 5dafd7ac7f0d9b0308182b80a13db0859a2d2972aff18dde5537b6c3969b18ba SHA512 18b3cf5f690cb65092da6c65fac36ab358d2c6762562cd62ec960e81db4b093006e5821539b01a02dc7344a86a6f9cca4fba45cefecf5834573c34ef15aeb0aa WHIRLPOOL ff59bce748d985dd8b4fbc90292073d7f568deb2dbe99d77d53ae576a4e2f9fb97d0e53b2cff0fb7fe4fc6f8c8a1c3f33c0fc0f2046a46a33c67d96a64a02685
-EBUILD gnome-desktop-3.8.3.ebuild 2029 SHA256 5c0fd22639ff480b9af512b690c10a1875620ea35b20b7ba89b84f6544e8f3b8 SHA512 c070e70ebb2b8ec266ce0608b59cdccf2409321b645736bc8eccb160c09feac8f140482aaa398a114cd2c14cbbaf550c02a43c77e79fd66560e1eb05b3730fcf WHIRLPOOL fb8a3a2a87d1941e969f585183d2cb58ee04b7d8427f87c6705c5a84df5d37cb832c279cd5bcb007d950b76a1565c644c5a04c70ba6ba83744b64ac7407d1b71
 EBUILD gnome-desktop-3.8.4.ebuild 2027 SHA256 d3b65b51dcba326b501c89d1936c0a7006f836a9692f73e19232143324c08345 SHA512 daa3ec3309f7d663ae371811d1dfdc45216e141f130749d8014bee191c4386112e9b560c35a199a719693c230b4147f87982740c19ae4be2d6af8d6bc60660ae WHIRLPOOL 32a3f290bec59b2ab4864c6365dd9ee60e364c1e91efa3f02a5cf2c3773883c9f7edf8705362336f6f1646aa69d0c0754b2f6c6d88a0d122419ec0a90f073f4c
-MISC ChangeLog 43318 SHA256 bba8567d61e5b170f935870a3cfe2c5b04c20443abd207c6464ade8c20025ed3 SHA512 312fc4dd339a80a4bfa8ddd8588a0489d211924da9c67b83eff8f76b0e906995634adf5bea4bb8761fe0a6b25c87f9684bd2f230d330ca6c99fb633df324cb29 WHIRLPOOL b8d5c63eb6abf4c801839ad7374be2abf56b93748e7e73d67ed5f55d9063a0c5212ecd354559ababade1c550c4cfa1d7b68454a39b82db968f697dcebcfbbc8e
+MISC ChangeLog 43557 SHA256 92dfdae2c5a6982ae5af0aaacac117c39cf16adcf865fcc6c917b0307b6ef7b4 SHA512 ef967dd96a3dcd0b599475e5898dc9406fe934934e620c69a8122b9060f112c6bf46ef6d4013f21ba01179374659cad1c5f41759ff5cb07f9f1fcfb669900029 WHIRLPOOL b958e031b7dbeaceba0b446e238937f1552feb8eeeb30ec044fc3325d32dd8631ad252b5fd81724dc3192d57807757ba7c94d0cee9f656854d8585b98afde278
 MISC metadata.xml 260 SHA256 963e6a57764d4be649262b46c80463a08be9f9d17442becdc59b6bb93991ba6b SHA512 953029172fb8243080bf818a116de3318527568efde018ef9fcd00ca64664041a110a6a9d083f7537985b97bcc3f0c4cd2638dd829924dcdea2248147e8a8625 WHIRLPOOL 4b49b8d1aeec77e2f6716e2aaa8ba84d88e7d521e415802aad82857d0c46a63fc902467d56ae3dd89cb147c7bfa337c88d76bedf64ed11b832fd6397a1439336
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlKkulYACgkQCaWpQKGI+9RkyACfUot8qx5VTfn1lGg1C0cv7Kin
-xLwAn0KauE7cUmrX+EU+/ftKtCvoo5se
-=Vp1W
+iEYEAREIAAYFAlK5tngACgkQCaWpQKGI+9SJMQCfWFTgg5ogTjYqtK+BflOBdhNA
+B68AniJktAB6JRwIbF1Q8TcdCUMJWbYU
+=X7Nf
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-desktop/gnome-desktop-2.32.1-r1.ebuild b/gnome-base/gnome-desktop/gnome-desktop-2.32.1-r1.ebuild
deleted file mode 100644
index c6b80247802c..000000000000
--- a/gnome-base/gnome-desktop/gnome-desktop-2.32.1-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-desktop/gnome-desktop-2.32.1-r1.ebuild,v 1.4 2012/12/19 07:50:45 tetromino Exp $
-
-EAPI="4"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-GNOME_TARBALL_SUFFIX="bz2"
-PYTHON_DEPEND="2"
-
-inherit gnome2 python
-
-DESCRIPTION="Libraries for the gnome desktop that are not part of the UI"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="license-docs"
-
-# Note: gnome-desktop:2 and :3 install identical files in /usr/share/gnome/help
-# and /usr/share/omf when --enable-desktop-docs is passed to configure. To avoid
-# file conflict and pointless duplication, gnome-desktop:2[doc] will simply use
-# the files that are installed by :3[doc]
-RDEPEND=">=x11-libs/gtk+-2.18:2
-	>=dev-libs/glib-2.19.1:2
-	>=x11-libs/libXrandr-1.2
-	>=gnome-base/gconf-2:2
-	>=x11-libs/startup-notification-0.5"
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-	>=app-text/gnome-doc-utils-0.3.2
-	~app-text/docbook-xml-dtd-4.1.2
-	x11-proto/xproto
-	>=x11-proto/randrproto-1.2"
-PDEPEND=">=dev-python/pygtk-2.8:2
-	>=dev-python/pygobject-2.14:2
-	license-docs? ( gnome-base/gnome-desktop:3[doc(+)] )"
-
-# Includes X11/Xatom.h in libgnome-desktop/gnome-bg.c which comes from xproto
-# Includes X11/extensions/Xrandr.h that includes randr.h from randrproto (and
-# eventually libXrandr shouldn't RDEPEND on randrproto)
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	G2CONF="${G2CONF}
-		PYTHON=$(PYTHON -a)
-		--with-gnome-distributor=Gentoo
-		--disable-scrollkeeper
-		--disable-static
-		--disable-deprecations
-		--disable-desktop-docs"
-	# desktop-docs will be built by gnome-desktop:3
-	DOCS="AUTHORS ChangeLog HACKING NEWS README"
-
-	epatch "${FILESDIR}"/${P}-gold.patch
-	gnome2_src_prepare
-}
diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.8.2.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.10.2.ebuild
index 5ab6fb93db32..b9abc5bd58c7 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-3.8.2.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-3.10.2.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/gnome-desktop/gnome-desktop-3.8.2.ebuild,v 1.1 2013/05/14 21:00:40 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-desktop/gnome-desktop-3.10.2.ebuild,v 1.1 2013/12/24 16:29:43 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"
@@ -11,7 +11,7 @@ DESCRIPTION="Libraries for the gnome desktop that are not part of the UI"
 HOMEPAGE="https://git.gnome.org/browse/gnome-desktop"
 
 LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
-SLOT="3/7" # subslot = libgnome-desktop-3 soname version
+SLOT="3/8" # subslot = libgnome-desktop-3 soname version
 IUSE="+introspection"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~x86-solaris"
 
diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.8.3.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.8.3.ebuild
deleted file mode 100644
index 49e37b15d5e3..000000000000
--- a/gnome-base/gnome-desktop/gnome-desktop-3.8.3.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-desktop/gnome-desktop-3.8.3.ebuild,v 1.1 2013/06/09 19:34:31 pacho Exp $
-
-EAPI="5"
-GCONF_DEBUG="yes"
-
-inherit gnome2
-
-DESCRIPTION="Libraries for the gnome desktop that are not part of the UI"
-HOMEPAGE="https://git.gnome.org/browse/gnome-desktop"
-
-LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
-SLOT="3/7" # subslot = libgnome-desktop-3 soname version
-IUSE="+introspection"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~x86-solaris"
-
-# cairo[X] needed for gnome-bg
-COMMON_DEPEND="
-	app-text/iso-codes
-	>=dev-libs/glib-2.35:2
-	>=x11-libs/gdk-pixbuf-2.21.3:2[introspection?]
-	>=x11-libs/gtk+-3.3.6:3[introspection?]
-	>=x11-libs/libXext-1.1
-	>=x11-libs/libXrandr-1.3
-	x11-libs/cairo:=[X]
-	x11-libs/libxkbfile
-	x11-libs/libX11
-	x11-misc/xkeyboard-config
-	>=gnome-base/gsettings-desktop-schemas-3.5.91
-	introspection? ( >=dev-libs/gobject-introspection-0.9.7 )
-"
-RDEPEND="${COMMON_DEPEND}
-	!<gnome-base/gnome-desktop-2.32.1-r1:2[doc]
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	>=dev-util/gtk-doc-am-1.4
-	>=dev-util/intltool-0.40.6
-	sys-devel/gettext
-	x11-proto/xproto
-	>=x11-proto/randrproto-1.2
-	virtual/pkgconfig
-"
-
-# Includes X11/Xatom.h in libgnome-desktop/gnome-bg.c which comes from xproto
-# Includes X11/extensions/Xrandr.h that includes randr.h from randrproto (and
-# eventually libXrandr shouldn't RDEPEND on randrproto)
-
-src_configure() {
-	DOCS="AUTHORS ChangeLog HACKING NEWS README"
-	# Note: do *not* use "--with-pnp-ids-path" argument. Otherwise, the pnp.ids
-	# file (needed by other packages such as >=gnome-settings-daemon-3.1.2)
-	# will not get installed in ${pnpdatadir} (/usr/share/libgnome-desktop-3.0).
-	gnome2_src_configure \
-		--disable-static \
-		--with-gnome-distributor=Gentoo \
-		--enable-desktop-docs \
-		$(use_enable introspection) \
-		ITSTOOL=$(type -P true)
-}
diff --git a/gnome-base/gnome-keyring/ChangeLog b/gnome-base/gnome-keyring/ChangeLog
index 9159bb0b3e16..5adb64c2c66c 100644
--- a/gnome-base/gnome-keyring/ChangeLog
+++ b/gnome-base/gnome-keyring/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-base/gnome-keyring
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/ChangeLog,v 1.237 2013/12/08 18:31:14 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/ChangeLog,v 1.238 2013/12/24 16:30:51 pacho Exp $
+
+*gnome-keyring-3.10.1 (24 Dec 2013)
+
+  24 Dec 2013; Pacho Ramos <pacho@gentoo.org> +gnome-keyring-3.10.1.ebuild,
+  -gnome-keyring-3.6.3.ebuild, -gnome-keyring-3.8.1.ebuild:
+  Version bump for Gnome 3.10
 
   08 Dec 2013; Pacho Ramos <pacho@gentoo.org> gnome-keyring-3.8.2.ebuild:
   x86 stable, bug #478252
diff --git a/gnome-base/gnome-keyring/Manifest b/gnome-base/gnome-keyring/Manifest
index d0ef2539095c..11615ef9bb2e 100644
--- a/gnome-base/gnome-keyring/Manifest
+++ b/gnome-base/gnome-keyring/Manifest
@@ -4,19 +4,17 @@ Hash: SHA256
 AUX gnome-keyring-2.32.1-fix-undefined.patch 783 SHA256 a7b0d99728960af4e81e97941fc1aa9f06e49b7ed06669ab17d72628cd05e408 SHA512 2f60202c4b07c37cc59d19838344ac666371495b9230c8f6b3a3030e58364dbb9a012ee8eeb6d89ed1e8dbb9324340971259a5b75e7666563a402c88735dc916 WHIRLPOOL 7030408d34850a6ac827149b3aaf1dd1f7f80ea7fa9731e4c76b5c95fedfec2bad51797f428685cdc9232fa455f2d78c814d35c06b905b2126d9a7aa8c2661e2
 AUX gnome-keyring-2.32.1-glib-2.32.patch 1355 SHA256 042bf9bc95f8e37bf9733531cc4d38db5c33d382f15152afdd7288ea09145fee SHA512 5745e64d77ec48cb8fe5b76bfc902f97749ee125e0c6db6ee7aed87f996cbae92e3c835792e76e33f49386ac8a9a4ec3613212f6ff5f470d038f2abf737c4aa7 WHIRLPOOL 23c45dd081eebaf9da75d159c71c3addd40e6f15b88c167ae932c6d3e0c261296c5e9222a0ed8cdf47045e9e30dc9f27bf331cb0482b26acfd5d2ac3f0ca611a
 DIST gnome-keyring-2.32.1.tar.bz2 1619245 SHA256 31fecec1430a97f59a6159a5a2ea8d6a1b44287f1e9e595b3594df46bf7f18f9 SHA512 23b91bc11be2805df228de98513a5f96386a89d6ead6434b7fdf4a3bee86b6601bb994b9de4524f8751c7d7f1ac9462c592bcd9b77c32234fc709148450e382b WHIRLPOOL fa9ed1d79a8af912ca8c4957d6dba30322a0239dd2c9b40f5c6adbfc66147402870a6400ae8bbdb56380c250e095b601ab9689f65ea17c95a76e7e2defe27c7d
-DIST gnome-keyring-3.6.3.tar.xz 1141948 SHA256 e0153a3f16a25e943237e6242054870802815e0f694c5a4cd808ee72f6014151 SHA512 aff1de6831be7b1e3e8383f14bcf408153c8729cea247e63be852bd527d4221238f182f2d2c73b081dab4bd6564e5c4df5d6848cfa311ba66c0fcf0dcacaa4bf WHIRLPOOL 141632220bed40b9faa9a1a481860ba0207986c78ba4072ad9726acc8cc24cc39e61f197d25b709c2380f8b06ad349f7179f39ab11d389ff4a8a199ca172c7b8
-DIST gnome-keyring-3.8.1.tar.xz 1140232 SHA256 56e0a47c021fb2d2fd2c723a0e1c9e46c9a0a81ed865ac1588c19aca16ca4f37 SHA512 a31ebada5528082c511ad3cb6a11aab03a76a3fc2b1012ea505483a1078f6ad229fd32fe846cbd77703ca4644225091aa05870c870c7c31262bc0338fe011fad WHIRLPOOL 9c0e561ab6047ff59d917c51a90311b320c533dfd076d66030efac15a55292d893d6b3c78813f0ea05eaa8a93a0c91527e26d82cc5eb87d93e413a64cfe6b671
+DIST gnome-keyring-3.10.1.tar.xz 1141960 SHA256 18001fa94c6d92e476b76423fe585dbf649051bba33012a037b07449c215dbf8 SHA512 ed37e64aed6963ee97894df58e380af2efa4995515891f36bce9aadeea29eef8b25d28d1b30adc0a3e912eb9ddf7662de92dc7b4962ed5aeaacaa7b60dd5b39b WHIRLPOOL 4e025fa3a3f9744ffb377e5dda40c3c194f3f4929805f530b59638d4750eb49f1975311b25b97b980d41305fa5062c11866924dd5d2bb711e9b0b03e64097c06
 DIST gnome-keyring-3.8.2.tar.xz 1138808 SHA256 f05692bb32db4d1afa65205ac4e68fa2b79107aca2393e237cf38f880cb7b868 SHA512 513c92ac3b5095b33dc075cdf318e750bf2c53d1344da93300c8888122abd6063f83227d6ae4de3903823c227281e51b4a15783770f86e222aeaeae89f8f2302 WHIRLPOOL c47605f594ebf133e91a585741a8fa4e8d8139f0f4d50d310d0d0cde1df6a8ae6fea569480cd948b3c7fa341045b2ba6a34e10c4c48357de70354edd06483701
 EBUILD gnome-keyring-2.32.1-r1.ebuild 2050 SHA256 3a06de08fda7f013e5f2ec5dd2bcd2d3e44f98fb1036404bc0862caf1094f39a SHA512 3dc6362f2687a3989879937abd67d43e925b46c0822b41fe0b530d8feecd41f39c15c00ee6b8bc12576c789c980fa5ca585ad93731b35ca1d1c537439e330f53 WHIRLPOOL dfe94dff29550f966515b202d7392f5340604da3ed7fa1d4e9b8dac76746c62fd9330064896435f7a800c6b0ab213f2fee4ebc1d42c41d67e36eb36df6e08065
-EBUILD gnome-keyring-3.6.3.ebuild 2399 SHA256 493e2f667caaaf023763e97584fac536fbbba9052295f79c514d3f7dcc55b6ac SHA512 a37a09ee22b5af85ee666a3225b794ba9a01af2e8b1ee0b2e3fc689477236cee348b47ebe72ff60ed3e4c0e080950777f21596228dde8bd2d516f60367b52f72 WHIRLPOOL ddb69b23413cafdc28719ac40e5b837f3d3570c7de6f2baaf170e5f2f477d78f9d6135956590b238c47e8dba5bffbe28ecb05d073684ec28190f7552dd32f5e9
-EBUILD gnome-keyring-3.8.1.ebuild 2261 SHA256 4a811504b9164d4df8375cd280042423d425df28772ac6aa202f0bc20e772fa3 SHA512 6c48088d2c1e4f8c59e5e80763da986a2732848547ead9ad1c8d807db700033e17a915ef9dc7e42467f6dd281046a8a76f805a0a85048f35842e2356fe8201d7 WHIRLPOOL 74717cc66281e920e2e6cd670806b3ce4aeb83d686016970fd5e9ee728b0f31080054694d35558e09099f6ef5030aead618590387c1225c10af13ac120406549
+EBUILD gnome-keyring-3.10.1.ebuild 2375 SHA256 81e13fdf2542b2087f3a010b634d9dceacf1c236c3a52c3b58f03d6312170011 SHA512 885338bc4dc3d944113e3ce3ef5dd2fd0449ee7742a405dfaf43472748030b78a4a6119bf2d5e4286bf069127d2f41923b110488f1764cf4a58e37d9ce547a6c WHIRLPOOL 8087147399058cfde28f37ce41c5dd01d8e468bcd1dfa5111b5d8c3b54d5b6f1e0ecb0e5e063bcccc7390d9f60aa6bf3346de96de83c46d388220ff190db39dd
 EBUILD gnome-keyring-3.8.2.ebuild 2421 SHA256 8d1a928e47f0bb17e489cb32de3e93c63f68b1d2ee5051133fbe43e33a1f398a SHA512 fa5012c68cbc7a140faf311781fe500c8a88bc06a476aac5d88677f712d1ea9c5c297a1a0bac579ed12342928ed3df489acd14271c11e59364f6ea7f6d7d7d38 WHIRLPOOL 314d6bd22f1c4d68ce7809c5f547c4df0ab19bc575980e54b4106954bdab8c2db05ee5b16ac02d050be15cd619da1fa9808d8d5d6ad2e2a4afeb6cc9290741aa
-MISC ChangeLog 34927 SHA256 352feea67ea2b6125a7013fd103f18af8d778e8e80385bd6c3cad032fc629bc4 SHA512 f038f80afe213856af1523a0f6f1259d87e107d25deba6126075f3c4fbc5bc8bda7e8961596f2407660135415de992101dbaf77d78a889a0406d052fc011a92a WHIRLPOOL ad77292816e0d74a121e69364a80379b448cad0162440edd3ebe8a3db433fbe8e4e0742ec9d983874d8e1dc3e6c849fa5c2d3be649204fa8c3cdd14e452e7941
+MISC ChangeLog 35131 SHA256 2fb52aa842eba679dc045bc21d673e28007fe68475c1b667dcaf6bc1894f29bf SHA512 9b7356e73d055c757e8e61edc33328a9042a58a6778d71b4eed1535e9f9f9263f73296a6a5022bb8a6671f3709a4de2870875551071255dd4330cb80d4b35ce0 WHIRLPOOL fdc2dc6b4b38c815a6e0e093a86a204c1c35f746ed19e72ce842d6ef38560a061f8010456f5d9b861d7972eb1e24b7ade599b56943707193177b2ce770734904
 MISC metadata.xml 645 SHA256 247a1437483f3ea8d7df3f99c065953686d0026f33120a3763fc46670278260f SHA512 a5f543871ff2cc3e56b1d703703338feed369933a6d183489e258b5e60b6b7246379a926d11e0697e3380a6bef2289beea48ac208691b16ea6a09306e44043aa WHIRLPOOL c2d5faa8a1d05dca37490fadb7932ec520948c8e0c9962778f05f4f2127b7bf86f31915be2cbbceffbc01f04769480bf15dae985c7575cc4667fe3afe3d97e7d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlKkuvMACgkQCaWpQKGI+9RM2wCcDFDLifw3aiShBt9xzKSqTedm
-vI0AnRHO4O4QeFlBkqPLA1xO9cHEyVMb
-=9Mic
+iEYEAREIAAYFAlK5trwACgkQCaWpQKGI+9SxSACghFHHhJw0NEKl8eVgw63ftxeB
+9PgAn0a5H9d1cl+p4DQzzBO8R7Tq8qXk
+=Sdpw
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.8.1.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.10.1.ebuild
index c55688ca9f2f..7dfa96df1455 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-3.8.1.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-3.10.1.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/gnome-keyring/gnome-keyring-3.8.1.ebuild,v 1.1 2013/04/28 13:38:52 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-3.10.1.ebuild,v 1.1 2013/12/24 16:30:51 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes" # Not gnome macro but similar
@@ -26,14 +26,13 @@ RDEPEND="
 	pam? ( virtual/pam )
 "
 DEPEND="${RDEPEND}
+	app-text/docbook-xml-dtd:4.3
+	dev-libs/libxslt
 	>=dev-util/intltool-0.35
 	sys-devel/gettext
 	virtual/pkgconfig
 "
 PDEPEND=">=gnome-base/libgnome-keyring-3.1.92"
-# eautoreconf needs:
-#	>=dev-util/gtk-doc-am-1.9
-# gtk-doc-am is not needed otherwise (no gtk-docs are installed)
 
 src_prepare() {
 	# Disable stupid CFLAGS
@@ -63,13 +62,17 @@ src_configure() {
 		$(use_enable pam) \
 		$(use_with pam pam-dir $(getpam_mod_dir)) \
 		$(use_enable selinux) \
+		--enable-doc \
 		--enable-ssh-agent \
 		--enable-gpg-agent
 }
 
 src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	Xemake check
+	 # FIXME: this should be handled at eclass level
+	 "${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/schema" || die
+
+	 unset DBUS_SESSION_BUS_ADDRESS
+	 GSETTINGS_SCHEMA_DIR="${S}/schema" Xemake check
 }
 
 pkg_postinst() {
diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.6.3.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.6.3.ebuild
deleted file mode 100644
index a2bfcc7608c4..000000000000
--- a/gnome-base/gnome-keyring/gnome-keyring-3.6.3.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-3.6.3.ebuild,v 1.2 2013/05/10 19:50:49 eva Exp $
-
-EAPI="5"
-GCONF_DEBUG="yes" # Not gnome macro but similar
-GNOME2_LA_PUNT="yes"
-
-inherit fcaps gnome2 pam versionator virtualx
-
-DESCRIPTION="Password and keyring managing daemon"
-HOMEPAGE="http://live.gnome.org/GnomeKeyring"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-IUSE="+caps debug pam selinux"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-
-RDEPEND="
-	>=app-crypt/gcr-3.5.3:=
-	>=dev-libs/glib-2.32.0:2
-	>=x11-libs/gtk+-3.0:3
-	app-misc/ca-certificates
-	>=dev-libs/libgcrypt-1.2.2:=
-	>=sys-apps/dbus-1.0
-	caps? ( sys-libs/libcap-ng )
-	pam? ( virtual/pam )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.35
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-PDEPEND=">=gnome-base/libgnome-keyring-3.1.92"
-# eautoreconf needs:
-#	>=dev-util/gtk-doc-am-1.9
-# gtk-doc-am is not needed otherwise (no gtk-docs are installed)
-
-src_prepare() {
-	# Disable stupid CFLAGS
-	sed -e 's/CFLAGS="$CFLAGS -g"//' \
-		-e 's/CFLAGS="$CFLAGS -O0"//' \
-		-i configure.ac configure || die
-
-	# FIXME: some tests write to /tmp (instead of TMPDIR)
-	# Disable failing tests
-	sed -e '/g_test_add.*test_remove_file_abort/d' \
-		-e '/g_test_add.*test_write_file/d' \
-		-e '/g_test_add.*write_large_file/,+2 c\ {}; \ ' \
-		-e '/g_test_add.*test_write_file_abort_.*/d' \
-		-e '/g_test_add.*test_unique_file_conflict.*/d' \
-		-i pkcs11/gkm/tests/test-transaction.c || die
-	sed -e '/g_test_add.*test_create_assertion_complete_on_token/d' \
-		-i pkcs11/xdg-store/tests/test-xdg-trust.c || die
-	sed -e '/g_test_add.*gnome2-store.import.pkcs12/,+1 d' \
-		-i pkcs11/gnome2-store/tests/test-import.c || die
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		$(use_with caps libcap-ng) \
-		$(use_enable pam) \
-		$(use_with pam pam-dir $(getpam_mod_dir)) \
-		$(use_enable selinux) \
-		--with-root-certs="${EPREFIX}"/etc/ssl/certs/ \
-		--with-ca-certificates="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt \
-		--enable-ssh-agent \
-		--enable-gpg-agent
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	Xemake check
-}
-
-pkg_postinst() {
-	fcaps cap_ipc_lock usr/bin/gnome-keyring-daemon
-	gnome2_pkg_postinst
-}
diff --git a/gnome-base/gnome-menus/ChangeLog b/gnome-base/gnome-menus/ChangeLog
index 2b39fc7f6da6..d2c6e80265b5 100644
--- a/gnome-base/gnome-menus/ChangeLog
+++ b/gnome-base/gnome-menus/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-base/gnome-menus
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-menus/ChangeLog,v 1.199 2013/12/08 18:32:19 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-menus/ChangeLog,v 1.200 2013/12/24 16:32:00 pacho Exp $
+
+*gnome-menus-3.10.1 (24 Dec 2013)
+
+  24 Dec 2013; Pacho Ramos <pacho@gentoo.org> +gnome-menus-3.10.1.ebuild,
+  -gnome-menus-3.8.0-r2.ebuild:
+  Version bump for Gnome 3.10
 
   08 Dec 2013; Pacho Ramos <pacho@gentoo.org> gnome-menus-3.0.1-r2.ebuild,
   gnome-menus-3.8.1.ebuild:
diff --git a/gnome-base/gnome-menus/Manifest b/gnome-base/gnome-menus/Manifest
index 30a74e2f61a2..71c78eda0686 100644
--- a/gnome-base/gnome-menus/Manifest
+++ b/gnome-base/gnome-menus/Manifest
@@ -12,18 +12,18 @@ AUX gnome-menus-3.8.0-gnome-calculator.patch 1765 SHA256 fa6134f15df7add10fc25fc
 AUX gnome-menus-3.8.0-ignore_kde_standalone.patch 1665 SHA256 5b27f8f02786db7383287bb233cc990934524e152778802e4c815307424e5d48 SHA512 db461006883594de834fff029b3aa769afa6955bc94062865d8c71ec224fdd64867693763c3ecb98921c98c7410bacf18dc2110b5322e1956c877e7fcf61bef0 WHIRLPOOL 5661aa027bcad2e380ca46f94143b043f43adc3ebe6ddcd9d21d951b3ab2a7d28167aa9faca183dd39d707428514b09fbe736dc0fa8bf72972230da5ab83f84e
 DIST gnome-menus-2.30.5.tar.bz2 471327 SHA256 6dcc565006d6e8c2025ae83ab1f82edf6bd04d61c804c0dc9bf5ea50629c4caa SHA512 e2722f8fc11d99b58de601171e10f87efd64e8752c26d3e2126ff909a4c263cd8be4842d3592b1029396fecf832aa094630fec2e47ea711a363cd03de2980a22 WHIRLPOOL e0d350971ecb541757ce2282e67010d29807eda61fb79be10e132fddd654529030991648d102cda43c15d0148cafc1627a814aff0b6292f947717e16f697a1bf
 DIST gnome-menus-3.0.1.tar.bz2 474839 SHA256 579c119c26f37781f66708e867ea45b3c37589b3b69e5b32d33e9bdb944165f0 SHA512 05eda56b741d7236b17276b3b208b8370ec8ff0db82e32a2c0adb84334c4d9365fe61dea08183858fb7c0093cf04a02ba1311483e3318dbe816a02c28f4198eb WHIRLPOOL f2583e79ea6aef0c5cffb94001ceba166b97e237861b51d39530155f36720bcfabbf50af0a16735f8112e44a7b8d7243ae9460285f590a0c2a351ad2203dc85e
-DIST gnome-menus-3.8.0.tar.xz 420556 SHA256 33c215ae8d815f4a94d2dbfc8c6679fddbbf8026d30da55a350e67ea940ce14f SHA512 b5c4e02583f1ed8dba1e658a696be3899b910fa99e94fbd897f35d7c677f232b9d501d7366b686f37bd9ba96ecca1a6efd668dd5fafb99500c3e91130a7b15aa WHIRLPOOL b805a128627713081cf7380f34f69a071c583f66b5ec6ec93829a6aa32a073991a6dc1cfaa40a3f45230ec91b41875c7f69b80605554b1441340303c1bffa996
+DIST gnome-menus-3.10.1.tar.xz 423052 SHA256 46950aba274c1ad58234374fa9b235258650737307f3bc396af48eb983668a71 SHA512 e6f0fe223e60f6c33a2ed2cd958035e5560d4063fbe7485263c4ad0eba82e18948d19f7dbe84dd0db5c339e94366759a0f98da533e2798c3ed9cc9a87f73c7e0 WHIRLPOOL f4d4266c7d3d06a4551b3a4aaa987c5e3d8ecf867afa5ea6c7c41de4675d4973e2a87dd80a604acfbcc29f14c0f1e70156faa93d13429f33218bf5e790eee1d0
 DIST gnome-menus-3.8.1.tar.xz 398652 SHA256 787aadd6d6c7e9b699fd4d8f04696c9559bc3eb9534c3fb3791e1d12bc21db57 SHA512 bfa319dceedab147d507b59b92d7b7698d5a90bc41cabd2773243b07d79d56b9c29c91d0fd836e86783ee560d0cb91812bc301b0d418e5b11f4aabde15f07635 WHIRLPOOL bbeab6704fdf7a61821c9a731fb4731abd05bf74bf29ec431ef83403e0ced491bbe41b35102607f3090f996cd0fe0150b3e6f7cb3a9f3e6d9f9b70142bf595e6
 EBUILD gnome-menus-2.30.5-r1.ebuild 2668 SHA256 5e2b7b9552469aca78c3dce9112d6b6867a922f84074814f224e8384f36671a4 SHA512 f98647ec8aadd2d28f523b215019c8f830cc419414ccee8f405b910019e2558c8c9c06a429d15e1eb838262b1cc501e1c6665bf9cfb8c64f26e8ed8798e26f37 WHIRLPOOL 9cfc8809793240e53e76c59085399b3517dcb42f91a7a9797e15381912838516ab89a140d27fc042c5a34ce8ccc472dd21942ef6777d26e91746e206de66fa0e
 EBUILD gnome-menus-3.0.1-r2.ebuild 2200 SHA256 14478e136fb39f95c99ca3be202341e02f20ae585c15ef40b145b4d118325346 SHA512 1af5ba588af654f83a13a73e7138bfcfa4c4ee90c144c99921407cd158edba9a21b4c533511a8c45e27e4789811ac605b26c853b712d5a0206c801fa59260126 WHIRLPOOL 03b7bef442bfcc9584180b022c5d2191f4dfdf151968943f75024be49e0e11ef6c0a823bd7bec5fb63f35f8ba31c6cc9dff2438ba5e2371f2359627abcfa57dc
-EBUILD gnome-menus-3.8.0-r2.ebuild 1690 SHA256 a561275e3e7e1cefcc377c9f0d9b534aafb7c0478f792af2266e119196251f71 SHA512 e1280adcbcb291daf6e7f4abeafe219efa10f83aa94a69097512d882bc8d62494af022a7e588346fc542f944eca1a96527f9eee8f74e4dfc24dbcc682a198f86 WHIRLPOOL 65811d33db5be814011075a0dffedee7304d58f513dee0d080f4cb45e59b6b86da7129ff70dc4d6af46c2735cc501d1401fc8da531acadc26afdad40844edb96
+EBUILD gnome-menus-3.10.1.ebuild 1447 SHA256 3bfb2fd1739281954b8514c9549bc67ee959a772c364b8698cae202206861fdd SHA512 62353efaf3a7c0060d21fb7fc1eb9ec9e629165a6709ef67c53e2028e47815baa918db886af7a1a173700f952628f16092d3b6360daff4c91293e8078580b77c WHIRLPOOL c1ae796eb07b05fa4526e7ed9a7ed6ead9f7d99b00014320dea7e0c26d775a7017f69d0c33ccd62a5e799dfd3164aaac17203560b67c4f672d44ce5dfb551a3d
 EBUILD gnome-menus-3.8.1.ebuild 1444 SHA256 6c218a1d7eb413bcb36d543d629f9a4225fad09dbde82cffb4003c57fcfe4b59 SHA512 b26d857c074f39a712a1ae298b1914e2f69b41902425daf4bc4404c139ece6bf4d3ec7af5281e557ad63e046fbbf962723867f9a87cf1dd5d0befd880994f532 WHIRLPOOL c3f7baf6ee258e8693eb8f03217509b8c8b91b3d1c46e17738f407ee8fba6d74b420331bf9c109936a5ff25fa2a4085f76f87ed5bc987703e7f583f04e324b53
-MISC ChangeLog 29343 SHA256 8a4b458b3af4de699d1df592eabad30c48daca0d007167f7559d84981deae37b SHA512 4dc60b067aaa221e19b9b5c7c2f92a077a3469d4ecd467f2c53a7063a66f472a80f3093a59b235dd4b8a65bcf9278b214e1e823d1f2ebe1b98cc9d3ddf724822 WHIRLPOOL 3e35841667547b9584cad93e39b3246d4a2aa99722a5415bbb2fe6552bf143e1c30dfa0a7f89d5a53b6d7e478179533c9783ba572ac910312e9e6aa58bb4f7e6
+MISC ChangeLog 29515 SHA256 2c2d8a8ce36b4c0425bec55979b348b33933ddfae082188f3ab5b75dccd10659 SHA512 2ba8b64f7651def9135568615b17ff634e5ee69d350f34fe3930d371487dc140409374c737b0f6a275d56fdd83a5d63069a72f21dbafe545e89fc416f91e91bf WHIRLPOOL a336c644a3c78a0bdef27e77105e78e11f90161d22ec6857c76635adb459e51ec182edff12cac9d8ee5d424cad2315e0aa05a70bc46fb8a34f8bb509f4a965bc
 MISC metadata.xml 159 SHA256 b1ccd57b80d8d6ee7a9924844efd69830edfb744ab818d67e50a008b5aae7d4b SHA512 9408846d0f3194f62043b64e325aed9e8cce9a74b556865acf71facc3ad59a092dccbbb3c608ada40b73625eaac93a7bcc976858c6a47426bb8fadb6f830fe2b WHIRLPOOL 4700c8b71899b5acffcc46580315d4d116b478cfa283e0ea0569ab180e46850ce85d73c7370d989e53dd8aecb69ed843d2716bfebd3c5d74a7b5c3d4b94b96bb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlKkuzYACgkQCaWpQKGI+9TT3QCaAsxdysYo8A9POvOF//xmF49n
-yB4AnjgZAt1TMz6uFbY19q6wrb4CH3/s
-=pYuy
+iEYEAREIAAYFAlK5twEACgkQCaWpQKGI+9RDSACaA0nEzvjomwPjh+hLKt49wvEm
+yc4An0d14+L8EOKrsBTOLIdbsA5nc80/
+=Q6qY
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-menus/gnome-menus-3.8.0-r2.ebuild b/gnome-base/gnome-menus/gnome-menus-3.10.1.ebuild
index 44209c093f2e..c4a2dba4ec9d 100644
--- a/gnome-base/gnome-menus/gnome-menus-3.8.0-r2.ebuild
+++ b/gnome-base/gnome-menus/gnome-menus-3.10.1.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/gnome-menus/gnome-menus-3.8.0-r2.ebuild,v 1.1 2013/08/28 18:44:48 jbartosik Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-menus/gnome-menus-3.10.1.ebuild,v 1.1 2013/12/24 16:32:00 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -33,21 +33,15 @@ DEPEND="${COMMON_DEPEND}
 "
 
 src_prepare() {
-	DOCS="AUTHORS ChangeLog HACKING NEWS README"
-
 	# Don't show KDE standalone settings desktop files in GNOME others menu
 	epatch "${FILESDIR}/${PN}-3.8.0-ignore_kde_standalone.patch"
 
-	# Adapt for gnome-calculator -> gcalctool desktop file rename (from 'master')
-	epatch "${FILESDIR}/${PN}-3.8.0-gnome-calculator.patch"
-
-	# Fix "Others" menu
-	epatch "${FILESDIR}/${PN}-3.8.0-dont-use-OnlyUnallocated-for-sections.patch"
-
 	gnome2_src_prepare
 }
 
 src_configure() {
+	DOCS="AUTHORS ChangeLog HACKING NEWS README"
+
 	# Do NOT compile with --disable-debug/--enable-debug=no
 	# It disables api usage checks
 	gnome2_src_configure \
diff --git a/gnome-base/gnome-session/ChangeLog b/gnome-base/gnome-session/ChangeLog
index e9a3f835e1ae..2a72f9035508 100644
--- a/gnome-base/gnome-session/ChangeLog
+++ b/gnome-base/gnome-session/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-base/gnome-session
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/ChangeLog,v 1.327 2013/12/08 18:33:57 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/ChangeLog,v 1.328 2013/12/24 16:33:10 pacho Exp $
+
+*gnome-session-3.10.1 (24 Dec 2013)
+
+  24 Dec 2013; Pacho Ramos <pacho@gentoo.org> +gnome-session-3.10.1.ebuild,
+  -gnome-session-3.8.4.ebuild:
+  Version bump for Gnome 3.10
 
   08 Dec 2013; Pacho Ramos <pacho@gentoo.org> gnome-session-3.8.4-r1.ebuild:
   x86 stable, bug #478252
diff --git a/gnome-base/gnome-session/Manifest b/gnome-base/gnome-session/Manifest
index 1e24df19b3e0..977a7affedd7 100644
--- a/gnome-base/gnome-session/Manifest
+++ b/gnome-base/gnome-session/Manifest
@@ -17,16 +17,17 @@ AUX gnome-session-2.32.1-idle-transition.patch 1802 SHA256 6e80574672ff9e4b9a637
 AUX gnome-session-3.8.4-blacklist-nv25.patch 592 SHA256 2c0894db69a13678d12047f14eae213c6ebf1c2b940e9e46a9297ef4ad1e2b8d SHA512 d112f286256f0dc94daf887cf40153a76fccd5684cd9f638510cd1caeeb5de2f51ffe2e298e992a6dab6d7a5ea11e12d0372365ecb2e29d0c2759f7ccc25ed94 WHIRLPOOL 40e1bb37592199fa25a188a8868d83116d336db12db29a7de7ecf611eaf92c239c35233c38f85f45b251e8a974f330ae0bdce4e28854b6a8ad651b261eecd24c
 AUX gnome-session-3.8.4-presence-crash.patch 2036 SHA256 14e24caadd8ed2056b00b0bd4eef0dec61b07fa9e72d8ca990e64bcfa42dabcb SHA512 dff7f096d562f8b7b661b6eda1d65a3f9a992cd4cd22604034f44ea77ca72b1282b9bced4702ca24e89185f97de54b4a554877b7cbc8a1ca9f55ef15030f3ac9 WHIRLPOOL faa03513c86fec3f313c3a1a14e40d86d2d35b636d5ad8aa70f17ae51424e205ae99dd00670ac41aaa2465e7281c63bc48574a41d5978ca78bf832a51a574ad0
 DIST gnome-session-2.32.1.tar.bz2 774842 SHA256 22d93ce433fcf9c7ce6b5f36dd81f64e692ea0e41faaa0f61159ddac28c3686a SHA512 5d688e971ff440d33c7fff86db7b11d06aa39e9f6b4654a54ef6f4b608fe39c24b13be04726c69dbca4600fa91dc21b2f12415499367ec6045212828674bed99 WHIRLPOOL e03c121c5c644975deae06590828ce84a66e583838fc7de28752026e6c798b6fa4eaa4d6cdfa4975930c7ead730568e051c4dc280e5c7c80ab2bd4e64ffe9ca0
+DIST gnome-session-3.10.1.tar.xz 767336 SHA256 f620704e07e6bbf49aa6c65897475a46f80f7ac5593606f2b6889c7cb4f6a9cc SHA512 a17fdd1943c118f025a740b22de1f5840a2f8a1a9fc7f8a2720deccf69097391c2d05e6115416c40c5530de60326f6bd729444dd7a3b2aeff115fe547ad94d8f WHIRLPOOL 12237e7bf0bcfb78a9435d9b71937849d1e07f86d111ed143fd0ee0598a0c198eccdf9ca62e1c3229ff1f00c0baded92a98516d712e0be8d3c1aae9586b3bfec
 DIST gnome-session-3.8.4.tar.xz 781124 SHA256 e6ccc71563d9e36d166ebb8a1e9fc962ff31605d5800af411d3b8df494f03ec1 SHA512 b9b52918d709fd02dfbd8212bf5f1fb3e1f8942bd0d9acf2bb776a52af162e6c92f72d3a4dcf4ff5df0a950eef11a5e5316372d41c46f93223cabbb811a3aa12 WHIRLPOOL d8269d6c9eb23e5c1be17eb4f1655cd054263145ecc63cb1173b163824ebab359ceda5b30cf01b9dd5fa2565056c298b971ccb99f959ccba8e830b286139829d
 EBUILD gnome-session-2.32.1-r3.ebuild 2972 SHA256 b67ca3d7c561adccea184b8a70e047a0009ead24da57d3a9d508a43f79289674 SHA512 c1ede08752fadb66a2d95f9b01a567170e72943ad71c6bbf23f12e1b70516e0b2de10a394b7811507e84b49164f303f715059b7d8972cfc2d6e66f76826c50f6 WHIRLPOOL 37a7fb42d6d44f76f7d23f7a3158589d9381e2c830e40e593a8b51b70ef00f590a7f7dae3ae0439e80e275a43bc607f47aca31ae2d69c113e7452901021e4379
+EBUILD gnome-session-3.10.1.ebuild 3460 SHA256 cbb84142608e6cc3b48e12a0920effcea9f4c07d653e2836938b57cc923d0dba SHA512 a2b0c96407c37ccb3b0d6b660e50f2cf92afd928d3973303ff3f56fc6882e38dfbb39c2b0900ae624d663be9fa2195ec2fcb4927a8e9becf1c67013c2e421687 WHIRLPOOL 53eb3a7f6df7df0066f6a391ebcc97dc4ed553202ac4e3f232bcfbefb9a7be5d9522d0cb53b5958bc478eee940fd56df51c321ca9b5de672bb69961527495715
 EBUILD gnome-session-3.8.4-r1.ebuild 3696 SHA256 7a86c3bb0dc5dc33ac550458bb126cb51b194cfde3d8ea040291907f65d0c2d8 SHA512 24aa8b8c59fa4f420f8639ad4d41de629c872200c88792d6b695ca2d48e6d5c586a2761e95335c5f924b8071eac7e6999db85bb6f5942c4103fac76d2064c601 WHIRLPOOL 69c96fd5e5a9bc07c129bf232676fb58fa1daaf68aa056cbb0d38cef89330b0af89236d1a6f2651edd60ba67595fe8abf52739e484c7da162b09a7383c96df29
-EBUILD gnome-session-3.8.4.ebuild 3492 SHA256 18ebb8f768f69d8d8a663ba9068951a276f6c6141f7b5995a49b4a1be9d875bd SHA512 0b699b76e436638146b7d532efea9bd7da1fd8a94dda989abbe567649420f12f7bb0c6513dfd832f742e301cdeb4c2fc8f5a3a30d91df191cd72d4be85d5c446 WHIRLPOOL f1e4fe6343591b470c15e7f4b06770b6134e73e63d2bff0cf7ea48a96daa2461f7c0b64272f5c047e05677981a5cb9750be683c656d6894a33427f39964e4e53
-MISC ChangeLog 49519 SHA256 98fbacae5354759a729d51b4e491d2b7a6a5529e565cf1a6ddfa7e8eb976e35b SHA512 317ebc19cf6f787309d656b347b63a5bd1eb7c88675ce8c78a43054c66152dfcfd364e0b0b9983adb6a0aae98950b9c34da08434b6479af0072cb0f8b8be2eae WHIRLPOOL fa1424c9623d32095c3741b76582b8de1ef29aadc85a807c0bbf6a279ac1b9b153191cea8b52ed2539e21c13e01e34ed399a4c21f09b7d217dabed8fb3846418
+MISC ChangeLog 49694 SHA256 25367e9a51a5ab341223f5289de2552611f654695dd7d3abe9a11fe1740c8180 SHA512 cabac881dab6dd3a9482c8472e77c85e70cb8fbb60ede8817a1e4a8f9c72796f505c015c997723107b16273563a7d6ba2130783367b83e799786475ad9a65be2 WHIRLPOOL 441104ec3e10087e514a1109a78c3bfee5620b862af2b82c2800ced70322e749efa10bbb46bb26424c8686e60797434cf033d89c8158af12db5a2fd22db2a8ac
 MISC metadata.xml 278 SHA256 4b6d5cc443e75f79675a992f133fdcf809fc528ca0e53bdbaf96a69383323c1d SHA512 32c59f5a0898ec7378ad33ac5a3f885f9b825633dfc0373603d413e8bf36b264c4efe03b8c0f4813237474ad858f929a74643869b7604c128e1ac5a5d1875b60 WHIRLPOOL 5552633b5518f886a89fa3a7b69ca5e8e7b81cc3436dc573e10990a4dea1e40ef14731a756501266449bbde0d9211145f9dccf3e3b728036645d6de1a6995295
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlKku5YACgkQCaWpQKGI+9RBugCfZBK3O2iYEKDxyB5UbCDEmfTj
-1VMAnAiUu+X14N/xt+1BsIFC5E8lJVnA
-=5lgZ
+iEYEAREIAAYFAlK5t0cACgkQCaWpQKGI+9RHbQCeLaym6tGg5JFEL0qKv7bewA3D
+HjYAnRJqm9sMUFuxW02knEHiMS/HMpnf
+=2QfQ
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-session/gnome-session-3.8.4.ebuild b/gnome-base/gnome-session/gnome-session-3.10.1.ebuild
index 2b955a23293b..1501ade937ab 100644
--- a/gnome-base/gnome-session/gnome-session-3.8.4.ebuild
+++ b/gnome-base/gnome-session/gnome-session-3.10.1.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/gnome-session/gnome-session-3.8.4.ebuild,v 1.1 2013/07/31 03:36:31 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/gnome-session-3.10.1.ebuild,v 1.1 2013/12/24 16:33:10 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"
@@ -25,7 +25,7 @@ COMMON_DEPEND="
 	>=x11-libs/gtk+-2.90.7:3
 	>=dev-libs/json-glib-0.10
 	>=dev-libs/dbus-glib-0.76
-	>=gnome-base/gnome-desktop-3.7.90:3
+	>=gnome-base/gnome-desktop-3.9.91:3=
 	>=sys-power/upower-0.9.0
 	elibc_FreeBSD? ( dev-libs/libexecinfo )
 
@@ -70,11 +70,11 @@ DEPEND="${COMMON_DEPEND}
 # gnome-base/gdm does not provide gnome.desktop anymore
 
 src_prepare() {
-	# Silence errors due to weird checks for libX11
-	sed -e 's/\(PANGO_PACKAGES="\)pangox/\1/' -i configure.ac configure || die
-
 	# Allow people to configure startup apps, bug #464968, upstream bug #663767
-	sed -i -e '/NoDisplay/d' data/session-properties.desktop.in.in || die
+	sed -i -e '/NoDisplay/d' data/gnome-session-properties.desktop.in.in || die
+
+	# Blacklist nv25 (from 'master')
+	epatch "${FILESDIR}"/${PN}-3.8.4-blacklist-nv25.patch
 
 	gnome2_src_prepare
 }
diff --git a/gnome-base/gsettings-desktop-schemas/ChangeLog b/gnome-base/gsettings-desktop-schemas/ChangeLog
index cead72e2d7ad..43476181ccc3 100644
--- a/gnome-base/gsettings-desktop-schemas/ChangeLog
+++ b/gnome-base/gsettings-desktop-schemas/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-base/gsettings-desktop-schemas
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gsettings-desktop-schemas/ChangeLog,v 1.59 2013/12/22 16:03:56 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gsettings-desktop-schemas/ChangeLog,v 1.60 2013/12/24 16:35:36 pacho Exp $
+
+*gsettings-desktop-schemas-3.10.1 (24 Dec 2013)
+
+  24 Dec 2013; Pacho Ramos <pacho@gentoo.org>
+  +gsettings-desktop-schemas-3.10.1.ebuild,
+  -gsettings-desktop-schemas-3.8.0-r1.ebuild:
+  Version bump for Gnome 3.10
 
   22 Dec 2013; Jeroen Roovers <jer@gentoo.org>
   gsettings-desktop-schemas-3.8.2.ebuild:
diff --git a/gnome-base/gsettings-desktop-schemas/Manifest b/gnome-base/gsettings-desktop-schemas/Manifest
index b9d64d9caf97..341bb2fe22b4 100644
--- a/gnome-base/gsettings-desktop-schemas/Manifest
+++ b/gnome-base/gsettings-desktop-schemas/Manifest
@@ -2,18 +2,18 @@
 Hash: SHA256
 
 AUX gsettings-desktop-schemas-3.8.0-metacity-theme.patch 812 SHA256 bd824f23bcc5e43e797ce9b4c641b7fa02c0a7d22e5fbaceba44ae8900b47fc9 SHA512 c173fb35b1e112aaefc5c10bc027080fc250102c57bcad8507f318d9f5a7b7cd2017234b076e5f98d658fe13efedfb69ab6153dd87681ed95325e7926183a9b4 WHIRLPOOL 1f61507a43de082cf0c1fff4d63d4bbd4436d20a06dd4833b14edd5c6d6089b0b4f76d57bc11d991e3c1deeb341808fa8078ba767a9c45a083a6ab0c8c94e12f
+DIST gsettings-desktop-schemas-3.10.1.tar.xz 468072 SHA256 452378c4960a145747ec69f8c6a874e5b7715454df3e2452d1ff1a0a82e76811 SHA512 42e7dc19d70c26c9ba6a7f030ea5467d9aab7ce7e4efd8a2c5bac643c354ef7a5eb02195a12f06d7615963a5fb83497437aee9ad72621ededb436cbd6a51d6a4 WHIRLPOOL f95e4c39142cb1874680aeca938e9267aa365ba593bb6f9cf654ff5769def16ca28574a35013d731e760968b20d69e635f0b5b490f95ba6f8809b834efb96780
 DIST gsettings-desktop-schemas-3.6.1.tar.xz 384248 SHA256 d9a877d209e668845d6cafcd62663b0f6e6154df5a96f581ff36f999050e67e6 SHA512 dc9d9173f4f89ece2f9b36748784d6832d28e73c5c90dabee3e7a4aa99a9f3e9f36986d85e64c9ddea8905d8de41fd5616b727b1a4b1818a30d37e66cf4ba9c4 WHIRLPOOL 87b756c86fd03ca665ec79819a92d7426190feb8ab07304ca7b7895e2de7fc98ed410bcfa494c18b0b162bd11cafa3929a83d71034dcae6025be1c84c8280788
-DIST gsettings-desktop-schemas-3.8.0.tar.xz 439508 SHA256 9583384299c3b8cc21f99327a84527d3e7e55a26ada35ea81522dc4c05a5ae0c SHA512 a05d2c105418f6bdc84ed11594ba38f9057c8307999122a6adb04b4499e450ae3443c3777d8b2dc58fb08021f5488dd0cf4fdf541e7940808d2212f72cfb510c WHIRLPOOL 030ef6105aeb670484bda90af253126694542935baac84cc12ea3bb469a76a304ae8ce864d51eccc2befe1022dd1fe57ed1bdd751fbc70bad7de89ab815925c2
 DIST gsettings-desktop-schemas-3.8.2.tar.xz 460228 SHA256 86070b2a4e1ab5a28f81b8fd413434eadc1f8505cbf14886d150eb925f93c827 SHA512 a5ee37f5e0c6c80fee50b9ac79f417f61a88c05e996493a081ad1c5c3ef8ccd2f71be93c93ecf01aa0a3de612245ea2fe58de5281ba1417b1d83ba098568232c WHIRLPOOL f94cb8c1d9115e03b61352f84d569673d3c8f203d1e1411184a8ef3ea5f9a2835dc8e3118147583188ec6946803a0744cf75ba72e296fe6674325d7473a9b7d5
+EBUILD gsettings-desktop-schemas-3.10.1.ebuild 979 SHA256 c4b27388eccc3c9a9cb837fa350e09b0c9ce692ef8fdd3371ebbacc03c1c08d1 SHA512 e522191884edf21fea21e851f08da10ab328c2e40cf0a6a9f978979ffdf582fcd78f0d12c3ef403a382e5ada3737ef0c13a7eaafa3aaaa2ee5e679e39e99a45e WHIRLPOOL 1dddb1bf21c391aac817d8c02c2c36daa4592e9cf02947f1f201591557979599ad49ce4b8fabb226850b9e0967e907b6b55d33332bca6f43f88ef2f974e52b60
 EBUILD gsettings-desktop-schemas-3.6.1.ebuild 930 SHA256 347d4ce7a5a42096b3f742fe4e56676a7f486d3df807a2572396b9ba143afc67 SHA512 c49d7681aaadeb5618d29d4747e21e2cdcd782478cd907ba570fb1ab5a2858e78f16c43d50e644338ee938a7261d8ad6e31af69fae362c7042934c7657fd21c6 WHIRLPOOL 040b8f508c64bd50a8f3a762777ac6ac4fd1605a753beb99311c33c612ff1da4b6ce342cb4345fda5859f25d93718775fe36f1132083d1dda0f259ac3eb62435
-EBUILD gsettings-desktop-schemas-3.8.0-r1.ebuild 1161 SHA256 022cfb294e5c9c7700024737efd8ce5ad2a0beed75ddc3f99e7ae3152f0e1b25 SHA512 4d0b7bcff75e6b2a348c41f4f3150ec0c5af31408ea84aae82973250dccbe6f147172a2fe5cfedd7bf09dedb7231d69bb01385d12337956f78d8d07b897a5966 WHIRLPOOL 3b8b08ae220a1b9a6588b2836d331d2b82f67affb5de9cc104f38ee98377730dd030ba36efaef9e4f6632fecffba3afaf3575bd16dc5436cb22379c9f6266367
 EBUILD gsettings-desktop-schemas-3.8.2.ebuild 951 SHA256 a6fcc9c6c0c1d4e83f5b886c1bef5d4169e39907c3278ddb77ae2fb559ac1a10 SHA512 ae12fa54954e75b436563b7324c192c745dad3e69440b755736fe64b55205cd9bc7280e57b19f7674b5183d5b4b6dc0af7148bbd8a3c7ddf50676a547e486435 WHIRLPOOL 337a790c81811a5c4ed1fac751fdcfac9144ef603697b547837458f17945c06f4d36d73ddfd98f372d10e1f0087808ea1ec12007eeeb5eb560f48f50c57f930f
-MISC ChangeLog 9680 SHA256 6150ee5080f2a1e9bbabc53f380b08d0ed138e5f9f53e3e27ef1c756c53802de SHA512 3cedbf7994e077fc9a602e03fad6ee0f0fd0f470fe2e8851cd33c42a36b75e0e59f18e30aefd27664e782105a3d4cdda6bd70e20e4c832d0283556a6e999e0ec WHIRLPOOL 3ec80ad1cc7c6e2af93f7eae2cce7669ffa9b4d065a3cfd8afa3c75cbdbb626f82ac935e0b2c7be7f8c8ee5ab003744989a152525f296d7344360724851b33f1
+MISC ChangeLog 9898 SHA256 5a2cd06ef1f728c17fb75373e5ca14c4199d6b121f6b23914324badf67e697f0 SHA512 be21cb86e04f4abdebe64428a335bfddfb9dc5a2cc8bcd4b761f746b89e0d0c2f27c645f6ac95eab89b3dc5e52593bba7154ca83b12d17a20252064cb04d657a WHIRLPOOL 4953782698a9bf85f2bf0c50e204a3d2893a3129c8396ec46dd4eef54391bffe9d3676b63bc9656f9012bdd238b832ef94281c4e308b123f790bb79897211c4b
 MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlK3DW0ACgkQVWmRsqeSphOaWgCcC7oBhjA2w18UuraFveYWS9L5
-fZwAn12ZRylM1CTM9CG6u27O86RL4LK3
-=X0xI
+iEYEAREIAAYFAlK5t9kACgkQCaWpQKGI+9TjgACcDXP0rUjwp0LB9zDsd6e3a4u8
+UXIAn3GIk2TArwmJ5BircljvnWUkvTZX
+=aQhQ
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.8.0-r1.ebuild b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.10.1.ebuild
index 6a38e56e4d3c..f4dd1ef6a82a 100644
--- a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.8.0-r1.ebuild
+++ b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.10.1.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/gsettings-desktop-schemas/gsettings-desktop-schemas-3.8.0-r1.ebuild,v 1.1 2013/05/12 10:03:44 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.10.1.ebuild,v 1.1 2013/12/24 16:35:36 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -8,7 +8,7 @@ GCONF_DEBUG="no"
 inherit gnome2
 
 DESCRIPTION="Collection of GSettings schemas for GNOME desktop"
-HOMEPAGE="http://www.gnome.org/"
+HOMEPAGE="https://git.gnome.org/browse/gsettings-desktop-schemas"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
@@ -18,20 +18,14 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd6
 RDEPEND="
 	>=dev-libs/glib-2.31:2
 	introspection? ( >=dev-libs/gobject-introspection-1.31.0 )
+	!<gnome-base/gdm-3.8
 "
 DEPEND="${RDEPEND}
-	sys-devel/gettext
 	>=dev-util/intltool-0.40
+	sys-devel/gettext
 	virtual/pkgconfig
 "
 
-src_prepare() {
-	# Don't migrate metacity theme for consistency with the rest of
-	# Gnome 3 theming (as other themes are not migrated), upstream bug #700154
-	epatch "${FILESDIR}/${PN}-3.8.0-metacity-theme.patch"
-	gnome2_src_prepare
-}
-
 src_configure() {
 	DOCS="AUTHORS HACKING NEWS README"
 	gnome2_src_configure $(use_enable introspection)
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>
diff --git a/gnome-base/libgnome-keyring/ChangeLog b/gnome-base/libgnome-keyring/ChangeLog
index ccd1b47fd50a..d0390b0f0969 100644
--- a/gnome-base/libgnome-keyring/ChangeLog
+++ b/gnome-base/libgnome-keyring/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-base/libgnome-keyring
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnome-keyring/ChangeLog,v 1.43 2013/12/08 18:37:27 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnome-keyring/ChangeLog,v 1.44 2013/12/24 16:39:24 pacho Exp $
+
+*libgnome-keyring-3.10.1 (24 Dec 2013)
+
+  24 Dec 2013; Pacho Ramos <pacho@gentoo.org> +libgnome-keyring-3.10.1.ebuild,
+  -libgnome-keyring-3.6.0.ebuild:
+  Version bump for Gnome 3.10
 
   08 Dec 2013; Pacho Ramos <pacho@gentoo.org> libgnome-keyring-3.8.0.ebuild:
   x86 stable, bug #478252
diff --git a/gnome-base/libgnome-keyring/Manifest b/gnome-base/libgnome-keyring/Manifest
index 0029c335501b..136234faf75e 100644
--- a/gnome-base/libgnome-keyring/Manifest
+++ b/gnome-base/libgnome-keyring/Manifest
@@ -5,17 +5,17 @@ AUX libgnome-keyring-2.32.0-drop-test.patch 3415 SHA256 4928c561f46b6dabab93d19a
 AUX libgnome-keyring-2.32.0-hang-tests.patch 607 SHA256 d48a03c9c241c2e23e6abc32627ee0c454aad50ab0287793895b5af784dc11c0 SHA512 6c842e018253841b5ea2138f19fae6a8cecafddb9b697f4ad8cdc287774d4db292f686e58ab0be47e66da72914a3205a3676819553ca5eda3708fee8a6b734ab WHIRLPOOL 3f7c92558aed3b013d7e8756c18be6e81756634dec7f9e4dde1b63e359e23929ed2f4177db259f352b97f2749e1f609fe69f32a194c3fe659678510a3d96b0ea
 AUX libgnome-keyring-2.32.0-run-test.patch 2090 SHA256 cdcbd565a4508b3f7211e69617b66442248414c1486cba70d59bc0bf93b21740 SHA512 3b002273d3655efca39f343eaeda1806420739041cd71ad4af6023dacae55e8d7f7ea6d25e482c64436005754dec4362005d03242792df01866a27f55c92ae0c WHIRLPOOL 7b4edfcc610fdd6bcb1a8b3c1d38966ea5c03c6efffed37823969fe19e78a6f19e59ff671d914cebb0691f1ce7ded76165d55e5b5cbae4640628a4cb66ed457d
 DIST libgnome-keyring-2.32.0.tar.bz2 412592 SHA256 56388c0d81ddfdb57d30e4963c83ecc1c18498aab99395420e0fff69929a0f0c SHA512 e143d470484e06152741f0ae5266b36b69062bed268066b612eac66a20e38d7b7613896eff9a76933abef8a631bbcb1629532202e443dda46c800460602ddab4 WHIRLPOOL afb3c852d980dd05ad9f4b3490582de2eba0e4967b5b7bcd82cbe0cd47f0a712dd40c9b80da8ca4a6ab054a719198496c9887b69d2b506c0c5a736d10d41d15b
-DIST libgnome-keyring-3.6.0.tar.xz 423376 SHA256 6dca37fb7b37f800f498031ffe303a567410bec09a9bdd877a18865dafcc9830 SHA512 23913270972423abfe3eef785d553f4460f2a9930b464509897b22120fd5d376c67945d0a92d49cfd03aea514985511acbbfc46e776b9bfd2cd2cace49d0fbee WHIRLPOOL 589b05557efed6ae6e9916d8903e986d5fd1acfc1ddf348adaf7e6db6086ea627ee07e7bfba4ec46acb3ecffb38d67605828a9d62a19be5d2c6292e2084476f9
+DIST libgnome-keyring-3.10.1.tar.xz 428336 SHA256 052cf1121ba823359afe534c425f7e216c6a2b1a2b316dee279dcf9032423772 SHA512 447f24792cf75c746e72f7e714e815f289820ae47f37458e8276eee148529d42f7a2f0a759ca466736e9f6ec46d998c3f7a735aa856db9bbfdf602e369138d7e WHIRLPOOL 7521fb48f5a3e7a5ef1e7421ec082ec864a0314d09783137dad14b36ad42f48dab52e90632d030028e5a80e802ce1d489b8242c1e71e7577876305431890acc8
 DIST libgnome-keyring-3.8.0.tar.xz 426056 SHA256 a8646f2bc62ef903be422946a6356b0718f7a4cbb29b5bdd35a84136f6b82f76 SHA512 9c2991ee7066e206b095ba82bc576d386b854d26637c1b6a9ae30ed9200bbb34a9c06c488624edcd6b607ad3b58b7954e6a3f1ee79fc9f595b7c517f23c06de7 WHIRLPOOL 4e862549281573d692c233a4b1bea7e3866223983a1e85f2e37d81a2d1dac9e2472c1d6cef3ac60e79304d3b67aa1548680bd9c57ca77b28b62f1b9d69844018
 EBUILD libgnome-keyring-2.32.0.ebuild 1653 SHA256 31872e6ceecca914861e5e39727fcb77463362ed805a70b6c9737bf52759af03 SHA512 4e0f25f3dd4eec04a20b6729e84bbdb834766435e47b4dfd60be7aba8c30dd8d6bd3e13e4d0e2f03ad41e0712a4895b5fd88b9b786ee83843dd323aa85060e03 WHIRLPOOL 1201dbacbbe5a00c9e6aeb0cb31b9cec0392071be9841e9f961ecbff9fab8947870f8cb5e81f2c3dd473c82c0b34a23aa2990107e0f10fc3697900714053a8f4
-EBUILD libgnome-keyring-3.6.0.ebuild 1505 SHA256 f2f3678e2387e9bb0112a153c0c44f93b274b60e5fb10c31cae5804b667ad3f9 SHA512 047f699a9f40ebedec711282fde3f6885301b6ddda3ed18ac1fb0b57518e23cfe88651046359ce775007926100eb7e9d3dfc112d27bb490dbf49aab5b438c0b6 WHIRLPOOL 1a039d23b9a1b5bb03220559b8f6cb0be38371a45adc2b577b30bee4c83aa033ce2ed95d49618fc1ee8b9e333391e88812ba39d1bd94c527b139cbd93370b7fb
+EBUILD libgnome-keyring-3.10.1.ebuild 1493 SHA256 3f0ce60aaa4cb86e3db1624cc0719f537573c5f0c024b0a9d18cdf9fe4e59bef SHA512 6ee3bdcddb58d5833a90fabad5c3df9e33c8ce9c081fcaecb10eb79733cfd863f8b1cb60865185a0f13c2b20431c9d33fcefba2fa8fab34c1d94e7332c3e089d WHIRLPOOL dd61dd9653a736c1c4ff9f9214379411b4624e9f590ccf349713ae6dc6858cf83187c69681bc47e5674ff3571481471a5a5d32410988f57d3e9555ff5075b3b5
 EBUILD libgnome-keyring-3.8.0.ebuild 1489 SHA256 e95786e3b9cb953acbe415cc08be8bde2530a6106d7cb4115d95793177ae1c18 SHA512 6e1a09913467c39b1472e6c88e210ad0d2060362c0e429b215bc38fe1b30e1ebf12cdd4459068d97082300410546ab20aea8fe54f5c42be761ddd3ac68f01b3d WHIRLPOOL bbcfd2ee93775fa366e7b99544b86d2bda7a7b73d2283a28b781f1fd822104cfc8734a5ed9057e699d80dd8d42368588a748ba88edb1e141ff4fbd7d57c0bfc6
-MISC ChangeLog 7258 SHA256 121434295882e12b049f364c6be0f6b6f50f8a375322878d720594bd80c6cd1e SHA512 853504e86062851219e1c016fda46f4a05e696b3b12d40ba4daa16728fb7d59397e74cb19672afb12762080d1b507db4a1235e35d09745f2a6f193942c84e163 WHIRLPOOL 651c0ba00dfdcfad3bcfa1999c4568b1ceeab99c41c1d8c0139d805475c24d633db0ccd760551ca48a4042611a33ad85f4a87da9bb326e5ad485da3088cce729
+MISC ChangeLog 7442 SHA256 5696761dc3ee5b18995b6dc5cc7c36b71533f056614ec72cf3c050d1ed0efc64 SHA512 1ae159b8cad08315f4673faa3e60e9f005ba8566180d8d4406d5e17fbb79bff88e8ac7031ea5a09ff7eb120fc343bfaa511acc2bd74f8191bba0e87ca4e6a012 WHIRLPOOL e9a616018208c8839e10f1b8c012f376cc5184d3f242a7a7e9853ce20590255044d33e2a38bb5ec662dce84b78307e228075cd3e0c903a772a02b8f5b5e36e34
 MISC metadata.xml 242 SHA256 11f4b4bb23bb0e880a44b0f3efb5b4b0eeebaccd23956c72cd0cd9d386739c48 SHA512 686291088cb59735ff7df03fc5f11e43110039e74b8b24a9a8a517ed0f490f5694b873177e1ee808c4576ca26027add8324c6ee4e57b6b44d680a2522ec40b5f WHIRLPOOL f7bdc3a5208e0173deca7b15b26b967b61c3cb33e01b8f16fb87e32870e6c4deae514ac6af3fc91c300f960f2113e663eea02a9c599935072aad91459caf5277
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlKkvGgACgkQCaWpQKGI+9Rq+ACfffbBrtC7y0Qf3eOiQHA59TkU
-H9gAn29gsgyL3SBKRoseMegHHl39iJP8
-=/NlL
+iEYEAREIAAYFAlK5uL0ACgkQCaWpQKGI+9QpvgCeK3j1pBvJmrrJDip2rveMiA9x
+ywcAmgNhD+6KBKJ9EsDcGFmCRQOd9UlF
+=eGG1
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/libgnome-keyring/libgnome-keyring-3.6.0.ebuild b/gnome-base/libgnome-keyring/libgnome-keyring-3.10.1.ebuild
index 14c107dddcfe..3620a6ab1c67 100644
--- a/gnome-base/libgnome-keyring/libgnome-keyring-3.6.0.ebuild
+++ b/gnome-base/libgnome-keyring/libgnome-keyring-3.10.1.ebuild
@@ -1,53 +1,53 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnome-keyring/libgnome-keyring-3.6.0.ebuild,v 1.2 2013/02/25 09:19:55 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnome-keyring/libgnome-keyring-3.10.1.ebuild,v 1.1 2013/12/24 16:39:24 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"
 GNOME2_LA_PUNT="yes"
 VALA_MIN_API_VERSION="0.16"
 VALA_USE_DEPEND="vapigen"
+PYTHON_COMPAT=( python{2_6,2_7} )
 
-inherit gnome2 python vala
+inherit gnome2 python-any-r1 vala
 
 DESCRIPTION="Compatibility library for accessing secrets"
 HOMEPAGE="http://live.gnome.org/GnomeKeyring"
 
 LICENSE="LGPL-2+ GPL-2+" # tests are GPL-2
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris"
 IUSE="debug +introspection test vala"
 REQUIRED_USE="vala? ( introspection )"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris"
 
-RDEPEND=">=sys-apps/dbus-1.0
+RDEPEND="
+	>=sys-apps/dbus-1
 	>=gnome-base/gnome-keyring-3.1.92
-	introspection? ( >=dev-libs/gobject-introspection-1.30.0 )"
+	introspection? ( >=dev-libs/gobject-introspection-1.30.0 )
+"
 DEPEND="${RDEPEND}
 	dev-util/gtk-doc-am
 	>=dev-util/intltool-0.35
 	sys-devel/gettext
 	virtual/pkgconfig
-	test? ( =dev-lang/python-2* )
-	vala? ( $(vala_depend) )"
-
-pkg_setup() {
-	if use test; then
-		python_set_active_version 2
-		python_pkg_setup
-	fi
-}
+	test? ( ${PYTHON_DEPS} )
+	vala? ( $(vala_depend) )
+"
 
 src_prepare() {
-	G2CONF="${G2CONF} $(use_enable vala)"
 	use vala && vala_src_prepare
 	gnome2_src_prepare
 
-	# FIXME: Remove silly CFLAGS
+	# FIXME: Remove silly CFLAGS, report upstream
 	sed -e 's:CFLAGS="$CFLAGS -g:CFLAGS="$CFLAGS:' \
 		-e 's:CFLAGS="$CFLAGS -O0:CFLAGS="$CFLAGS:' \
 		-i configure.ac configure || die "sed failed"
 }
 
+src_configure() {
+	gnome2_src_configure $(use_enable vala)
+}
+
 src_test() {
 	unset DBUS_SESSION_BUS_ADDRESS
 	dbus-launch emake check || die "tests failed"
diff --git a/gnome-base/nautilus/ChangeLog b/gnome-base/nautilus/ChangeLog
index c8c25c016b6b..5756590acad5 100644
--- a/gnome-base/nautilus/ChangeLog
+++ b/gnome-base/nautilus/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-base/nautilus
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.413 2013/12/08 18:39:42 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.414 2013/12/24 16:40:36 pacho Exp $
+
+*nautilus-3.10.1 (24 Dec 2013)
+
+  24 Dec 2013; Pacho Ramos <pacho@gentoo.org> +nautilus-3.10.1.ebuild,
+  -nautilus-3.6.3.ebuild, -nautilus-3.8.1.ebuild:
+  Version bump for Gnome 3.10
 
   08 Dec 2013; Pacho Ramos <pacho@gentoo.org> nautilus-3.8.2.ebuild:
   x86 stable, bug #478252
diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest
index 5b384982a5f0..77c7445a5ce9 100644
--- a/gnome-base/nautilus/Manifest
+++ b/gnome-base/nautilus/Manifest
@@ -5,19 +5,17 @@ AUX nautilus-2.32.2.1-gold-glib2.32.patch 698 SHA256 a9da048e66d4f326fbfa6b916df
 AUX nautilus-3.5.91-delete.patch 1893 SHA256 3471db5c9f2caf4ae4877fe1c1e8a53bbf972aaacdf8cfbe091d8debd24f937a SHA512 807fb309cf217225396bfee5e60856245671a75058c95bd96dffe796e4c27c311aac603afba90c7660595611fe227de0951201e92e5e4da905b01c5ea3ca2460 WHIRLPOOL b6b8a1e69c4a4ec9ddfa437f611bea5711a41b8bc37c0f2701cc210063ec7eee93f92ccb9ca0b70ba5f7abc9fe128e44ad34582d077f4ebddce62e0222e9a025
 DIST nautilus-2.32.2.1-patches.tar.bz2 6984 SHA256 0b756ba661d1f9ed0d2e49a469e6f390e941530309e08a7f9e6ac07b566180bb SHA512 9c18c24001cc3cbf91242845f13bbe44160b85286ab82e29083e06905a0d278a5e9e554dc1e09445490fa723677d4beb080f2d23b934386b8de7704f8bb7e417 WHIRLPOOL d875e319a00288aa46d55c7edee5b1c53ff854ab41f73a4135a5f993e83f658da0b190d44d27fc9d4277de783f55e4e3f9ed3fede444b4b06384a8216a1d087b
 DIST nautilus-2.32.2.1.tar.bz2 6350203 SHA256 802dacc98c697afea2e6201dab1c8c800809f235fff39857983efb4340ecc303 SHA512 cb9d65d16c8d771d182bb94d9de59c4054b05603b8ad33beeca26b41c3ca3c84581b596625f6503924c4a26f5ca1218c6d1e81c9d94e6cc637a3e8a941cde9b4 WHIRLPOOL c98d2750f5b32896c67d1fc6060e1c288296a4a86142fa35eb261f8630fdd92ad974cf3bd66d3843f0073c7ec96081afd01063c4c2d10d70059efc58da9a2fa0
-DIST nautilus-3.6.3.tar.xz 4959376 SHA256 d272027754ce8591959ae854fc6b5f43eee4af31e4eecf06de727acebe0ee46c SHA512 f90ed3253889764dc3799e53555a9d6e84876b5d5ea020ba34b643df460f703acbba85bba0cf468ea7d614ec954b49304e46a27d46459b4aaa7e53ecd9467895 WHIRLPOOL afe1f70635899aaa3e7b8df575cef9f810c84acd1c63c5a1359584274c689872b1fdfc5e31a6964a419ee0e85c2cacce357a2098052db24d46a980363fd7c923
-DIST nautilus-3.8.1.tar.xz 4981224 SHA256 9827e939aa0621041754379ca0227ceb82877785f013dd5935ecc4b791314892 SHA512 95041119ccc322b5ebdc994729f8721dd86356a22cbb5163a46656a027209cd4e585bc1972b038340248a745cddc7107438d9f1eb85889e06e19e0a1cdf3ae9d WHIRLPOOL edd3738638e0c7089be59584d845c843a49071d495eef2c2c2b2feadcaa5131394ae6c1f0a7e073d66cc8abd8af950be66d39e1ab5bfc2a5eeb71c8dddc04121
+DIST nautilus-3.10.1.tar.xz 3334432 SHA256 f6a532a170907d116e8ce55847c5c6cd4e03819f5f818087554f2ec2556fc727 SHA512 a201d661104025b4b5ef4d0aa8ba7d083bb60e164c948e9932a78967f4046cc6e3afe7dcd5d20cfb99f500c4561555022cce4c39f2acc72370a515141798e90c WHIRLPOOL f9ab9305ea528233f1e318b2b96323d4568ac2c7880921a4700b01fc7510bd447bcfb90091655dd02f850cf508211d8abbaea5321c16ea62d2876175726900f8
 DIST nautilus-3.8.2.tar.xz 5024048 SHA256 dbddfdaac52d077d46d48a2f8dbecf6d13788d8f6b5fc9aa70826a24681d8a75 SHA512 bca8d37e43863c2eca79f060eb380f4c81f480811348e3c0c2f641c99162cc9043599b14ab405713b9f2063214727918f8818a7ea97d4a327bbb245825a56cc2 WHIRLPOOL f92b8b82370d72d853295a8c55f9735b71491efe30b61fad0b9db0657f1cec7bfa26f38f995a21e01f076df984c7e0b27d71a7127ab1b3aaf206069d4c7acc35
 EBUILD nautilus-2.32.2.1-r2.ebuild 2225 SHA256 0a9fd9c598526e17a80c185b74620db7d3fc7f5a8cee09016df74ba04e490bda SHA512 db21cd14f90f55a633a0cd8538148e12efbf20a5633a61024f521e40d1a1f60b72efe4b6ecfbfb3ae96d4032800be17a5cfab15c2d39b11d76e7d8dc344ad66f WHIRLPOOL baa604a25dccbc7955d692dd126453f589db4499c96dff39a7445970fa8e70e5f814613d33658eb85d4f61bcbe9bcf65f4fc67d82cc04aa1ea40a0dbb0a5acea
-EBUILD nautilus-3.6.3.ebuild 3297 SHA256 61455105d63f8fd371e4d07f2f2b7d1c174bd35df4c2ef4208a1a2c138776d32 SHA512 738e96366caf295c591b55125d4993bec19e023a86ac613ab603d7b26eac8ea2b02c3e44e23ed4dddbb33736d3a10ff68be83c9faaa3111a5d3380bed1aea0d0 WHIRLPOOL 2e15378116a00a1bfbf791cb2637e5efa04b6a978fdf011baf31ec81261ed22f01262c0e71ed0d96af1db939ee456cc54336f20c9cd0ec853677dd0f20da97d9
-EBUILD nautilus-3.8.1.ebuild 3481 SHA256 88881850c27436c0ac4e122a823bc9c641fdc556adc7d9b7a61c7c065fcf785c SHA512 619c4e992443cc427838c345e907486699ec33b5b544f6ab8b42e5bcd38f50184e5690072609a3a78dc3c3d82f06dabc3007a7cdc375687447a22da199b2d9e0 WHIRLPOOL ad9bec7bedf3f2a3c1f2f76e349c0b12e0c3508889c1bd3e82cc62ff9c12f731a436ebf7355581125049fb617cba8b4a79cc960d173096f0e71f3e568402010a
+EBUILD nautilus-3.10.1.ebuild 3475 SHA256 2db8ee4ee97ee9c7325775fd1d652954d1819f99e4c3c08b9bdc54182c25c4cd SHA512 e772483ca20fafe09acda5d655343913fd5b833d9ab15a8c68138da71e6522a3c75c414478c98bf924f4f68cac1fd099e3692b178a7e86c1ca61c5d9a597aa2b WHIRLPOOL 48d15ab9745e02b533675346083a4f6ed388f829e046941009fffd5917f5b90fad01edc6dea412db0e139bf27dc8fd2dbfbef3ed3978497b88d53c964f5d3559
 EBUILD nautilus-3.8.2.ebuild 3481 SHA256 a0f22e41e77fd69d46c1021b61c093f9730cac5e8472de832064553174c47ac9 SHA512 f8a6a7fb18f1481456517d15d1a4cdcb26113c8e9e7af5b8c59703e3702b1e2f7de66b6e75f80d14ccbdf51e9f745999839564661b70cfaf615018c10467e7c2 WHIRLPOOL 20e65eee92de194a629d64dd9707911d6c28c696e41ba6e3e736134899f5953dd628beeb7db154c2f49df9e5ccfba4b599ba7ca5e602933e28871718b5514a81
-MISC ChangeLog 62614 SHA256 ea435de776149975061e360034114851a8eeb2d14e491aaebc2c68021005b078 SHA512 69a79371dcad5e628ab31e6c136b37379793a0dd9a1352874926dab9806ec2f85a5e8492f0a6c0645e6b3329f8be819149e33f2c8a14c39a272f307ea4b1b207 WHIRLPOOL 091ce405ddee85fbdef3487494218ff0d5d67b0f158eb8569a5290a52cda69fe33f01d30ef522a872c1dd519bf7ace6ea123b82eb419ae848734a16032f8c3d6
+MISC ChangeLog 62798 SHA256 656ef48bcc7cf4af920c2d3d2c16e7a9e6ea1d6a95ce46511d91097fbf991606 SHA512 575b35703b705a9e738896308d23c5ae1991b1360d8a3acbfa6e5b469f304f44d8b44e6c1dac4db4abf32ca0f9e4db98c26f24a723d539496df2c77f727e2cef WHIRLPOOL 1423270129ec925a75a77cb6e78a009d40f6871c0be5df93c1a377c0f7bccd476d1eea18c6d6fb5f35337d90e2896f965f441ba50179e1b4dbc309944962ebb7
 MISC metadata.xml 566 SHA256 c278ed8fe54c80b07d7b2495826346538a7daaeea11dd9bdeff87ec0a30e74a1 SHA512 daefe3974dae1d708f909a2207f2d09128ab045f8aee11c823093da779e3f283c59459a0f4962631b1508dc545b6ab448c1ead519839011ddeb619f4017f802a WHIRLPOOL b662f3823904bc970b1a8bcd4ca863a7726eb89c76ef4c1d6954ba4b720f4d7490b4cfcf1d30b683a8ecf562d74977598db7b976ec4eea943e86aa07c4dde28b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlKkvO8ACgkQCaWpQKGI+9TLBgCdFK1XXe2lFiqDUlt8pN77iOfm
-O94An1aMTSITHoPpPrjS6uKHVtUvGFFm
-=F/gb
+iEYEAREIAAYFAlK5uQUACgkQCaWpQKGI+9SyDgCdGycRMGSU2RNWX/Zb1nhWUNpb
+GxIAn0SznKuyd0W+fjbtkvKd1yNrwVQ6
+=BYgD
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/nautilus/nautilus-3.8.1.ebuild b/gnome-base/nautilus/nautilus-3.10.1.ebuild
index b37762e560cd..a26ad3be6641 100644
--- a/gnome-base/nautilus/nautilus-3.8.1.ebuild
+++ b/gnome-base/nautilus/nautilus-3.10.1.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/nautilus/nautilus-3.8.1.ebuild,v 1.1 2013/04/20 12:08:17 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-3.10.1.ebuild,v 1.1 2013/12/24 16:40:36 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -13,6 +13,7 @@ HOMEPAGE="http://live.gnome.org/Nautilus"
 
 LICENSE="GPL-2+ LGPL-2+ FDL-1.1"
 SLOT="0"
+
 # profiling?
 IUSE="debug exif gnome +introspection packagekit +previewer sendto tracker xmp"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux"
@@ -27,7 +28,7 @@ RESTRICT="test"
 COMMON_DEPEND="
 	>=dev-libs/glib-2.35.3:2
 	>=x11-libs/pango-1.28.3
-	>=x11-libs/gtk+-3.7.7:3[introspection?]
+	>=x11-libs/gtk+-3.9.11:3[introspection?]
 	>=dev-libs/libxml2-2.7.8:2
 	>=gnome-base/gnome-desktop-3:3=
 
@@ -68,7 +69,8 @@ PDEPEND="
 	tracker? ( >=gnome-extra/nautilus-tracker-tags-0.12 )
 	previewer? ( >=gnome-extra/sushi-0.1.9 )
 	sendto? ( >=gnome-extra/nautilus-sendto-3.0.1 )
-	>=gnome-base/gvfs-1.14[gtk]"
+	>=gnome-base/gvfs-1.14[gtk]
+"
 # Need gvfs[gtk] for recent:/// support
 
 src_prepare() {
@@ -89,7 +91,7 @@ src_prepare() {
 }
 
 src_configure() {
-	DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README THANKS"
+	DOCS="AUTHORS HACKING MAINTAINERS NEWS README* THANKS"
 	gnome2_src_configure \
 		--disable-profiling \
 		--disable-update-mimedb \
diff --git a/gnome-base/nautilus/nautilus-3.6.3.ebuild b/gnome-base/nautilus/nautilus-3.6.3.ebuild
deleted file mode 100644
index 995bb727500c..000000000000
--- a/gnome-base/nautilus/nautilus-3.6.3.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-3.6.3.ebuild,v 1.5 2013/02/25 09:24:31 zmedico Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit eutils gnome2 virtualx
-
-DESCRIPTION="A file manager for the GNOME desktop"
-HOMEPAGE="http://live.gnome.org/Nautilus"
-
-LICENSE="GPL-2+ LGPL-2+ FDL-1.1"
-SLOT="0"
-# profiling?
-IUSE="debug exif gnome +introspection packagekit +previewer sendto tracker xmp"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux"
-
-# FIXME: tests fails under Xvfb, but pass when building manually
-# "FAIL: check failed in nautilus-file.c, line 8307"
-RESTRICT="test"
-
-# FIXME: selinux support is automagic
-# Require {glib,gdbus-codegen}-2.30.0 due to GDBus API changes between 2.29.92
-# and 2.30.0
-COMMON_DEPEND="
-	>=dev-libs/glib-2.33.13:2
-	>=x11-libs/pango-1.28.3
-	>=x11-libs/gtk+-3.5.12:3[introspection?]
-	>=dev-libs/libxml2-2.7.8:2
-	>=gnome-base/gnome-desktop-3:3=
-
-	gnome-base/dconf
-	gnome-base/gsettings-desktop-schemas
-	>=x11-libs/libnotify-0.7:=
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrender
-
-	exif? ( >=media-libs/libexif-0.6.20 )
-	introspection? ( >=dev-libs/gobject-introspection-0.6.4 )
-	tracker? ( >=app-misc/tracker-0.14:= )
-	xmp? ( >=media-libs/exempi-2.1.0 )"
-DEPEND="${COMMON_DEPEND}
-	>=dev-lang/perl-5
-	>=dev-util/gdbus-codegen-2.33
-	>=dev-util/gtk-doc-am-1.4
-	>=dev-util/intltool-0.40.1
-	sys-devel/gettext
-	virtual/pkgconfig
-	x11-proto/xproto"
-RDEPEND="${COMMON_DEPEND}
-	packagekit? ( app-admin/packagekit-base )
-	sendto? ( !<gnome-extra/nautilus-sendto-3.0.1 )"
-# For eautoreconf
-#	gnome-base/gnome-common
-#	dev-util/gtk-doc-am"
-PDEPEND="gnome? (
-		>=x11-themes/gnome-icon-theme-1.1.91
-		x11-themes/gnome-icon-theme-symbolic )
-	tracker? ( >=gnome-extra/nautilus-tracker-tags-0.12 )
-	previewer? ( >=gnome-extra/sushi-0.1.9 )
-	sendto? ( >=gnome-extra/nautilus-sendto-3.0.1 )
-	>=gnome-base/gvfs-1.14[gtk]"
-# Need gvfs[gtk] for recent:/// support
-
-src_prepare() {
-	# Restore the nautilus-2.x Delete shortcut (Ctrl+Delete will still work);
-	# bug #393663
-	epatch "${FILESDIR}/${PN}-3.5.91-delete.patch"
-
-	# Remove -D*DEPRECATED flags. Don't leave this for eclass! (bug #448822)
-	sed -e 's/DISABLE_DEPRECATED_CFLAGS=.*/DISABLE_DEPRECATED_CFLAGS=/' \
-		-i configure || die "sed failed"
-	gnome2_src_prepare
-}
-
-src_configure() {
-	DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README THANKS"
-	G2CONF="${G2CONF}
-		--disable-profiling
-		--disable-update-mimedb
-		$(use_enable debug)
-		$(use_enable exif libexif)
-		$(use_enable introspection)
-		$(use_enable packagekit)
-		$(use_enable sendto nst-extension)
-		$(use_enable tracker)
-		$(use_enable xmp)"
-	gnome2_src_configure
-}
-
-src_test() {
-	gnome2_environment_reset
-	unset DBUS_SESSION_BUS_ADDRESS
-	export GSETTINGS_BACKEND="memory"
-	Xemake check
-	unset GSETTINGS_BACKEND
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	if use previewer; then
-		elog "nautilus uses gnome-extra/sushi to preview media files."
-		elog "To activate the previewer, select a file and press space; to"
-		elog "close the previewer, press space again."
-	else
-		elog "To preview media files, emerge nautilus with USE=previewer"
-	fi
-}