Version bump for Gnome 3.16. Clean up old revision.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xC6085806

13 files changed, 504 insertions, 36 deletions

diff --git a/gnome-base/gnome-control-center/ChangeLog b/gnome-base/gnome-control-center/ChangeLog
index b1e578e54805..1203c358853d 100644
--- a/gnome-base/gnome-control-center/ChangeLog
+++ b/gnome-base/gnome-control-center/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for gnome-base/gnome-control-center
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/ChangeLog,v 1.166 2015/05/12 18:44:10 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/ChangeLog,v 1.167 2015/06/09 15:41:36 eva Exp $
+
+*gnome-control-center-3.16.2 (09 Jun 2015)
+
+  09 Jun 2015; Gilles Dartiguelongue <eva@gentoo.org>
+  +gnome-control-center-3.16.2.ebuild,
+  +files/gnome-control-center-3.16.0-keep-panels-optional.patch,
+  +files/gnome-control-center-3.16.0-make-wayland-optional.patch,
+  +files/gnome-control-center-3.16.0-networkmanager.patch:
+  Version bump for Gnome 3.16. Clean up old revision.
 
   12 May 2015; Pacho Ramos <pacho@gentoo.org>
   -files/gnome-control-center-3.12.1-networkmanager-version.patch,
diff --git a/gnome-base/gnome-control-center/Manifest b/gnome-base/gnome-control-center/Manifest
index 493dd338993d..d702ae20535e 100644
--- a/gnome-base/gnome-control-center/Manifest
+++ b/gnome-base/gnome-control-center/Manifest
@@ -4,16 +4,21 @@ Hash: SHA256
 AUX gnome-control-center-3.10.2-gentoo-paths.patch 4304 SHA256 63a8fd44d0585c141e3207b697266850215ee3e0254621c4aa15ae17469dd385 SHA512 5340686d2e0de699d495d30e6969f5c4fcc5ce735e43d659da326c9445821c6de142b8ab98c858cf7c33c6c2acbbc91aab8d145d32bc2a4a17caef99a09f8623 WHIRLPOOL ff8aac218544b8ea0caa2cd7210129ca5277275a8c7db3846e4ca8e8c5eed6d8ca1e0a9de415d52ab51bf624247bd248442cc18a79fb8ba0f0ec032cef81663d
 AUX gnome-control-center-3.14.0-optional.patch 19466 SHA256 154aff2082e4c9009e4bda1a54fa479430cfde08c91e446b64517cfe7a2b28d9 SHA512 e59082f637573a339aeb931423e55e971118c3b1ed05474d315c86843d0766f0339e33c4461e6b2e6e8bd167de6dc0705cf37aa44ea886fed3fa9d174678ff17 WHIRLPOOL 92603d135e486694c6a4b4af735e6498c14259c5b1e5add1b0a944f4809a2da2d8aa0edece113e683aa52e276ca9951c585c285d1033d9730a7eb8b87020d689
 AUX gnome-control-center-3.14.2-networkmanager-version.patch 2255 SHA256 fd54ec2c32eba9318d111c13ddb3d4f74985586af65182471917556599b58eb3 SHA512 88ec790e9d129f5b6006c2cb0b4b36a99b9609e408c6d8669f2a7421cbc24e249fa77bb82550f327aae13d4e5bba6ae57a70f5465a41e6c25452084a604edf7a WHIRLPOOL 65f8e63cc6adcca6269821e4326be66a7b035f12dc563704957b1472827ba1c61e19e5ffa055307758737122f2b4616d92ee55041f08f627700056e1711003c2
+AUX gnome-control-center-3.16.0-keep-panels-optional.patch 1000 SHA256 531a11c45db522d4860697d61c5ceda7768e8bf604d9c31616de13307dc4f046 SHA512 98cab117e23ebe50ce780620c664154e9a9c53243b8c346f3554cf217b86a52774ae8b69e04e66c78ec44974a188a7d24b41ace9bceb45b619e803a0e8155088 WHIRLPOOL b3f5968a756b0a7b8a3fffad98f576a2e59a8339896c9f3570567083406c38d87b1849ef4ca1bb59cfb2f81105a8d700d5f439db3449d2d6bd316857b1e68864
+AUX gnome-control-center-3.16.0-make-wayland-optional.patch 1338 SHA256 568b9f6d588ec940ba69801063085f7e9673b08e592b40938cbf1312991e084f SHA512 6bdf6d80652acfe3e07ca9e419818ba83256e3a4d6f9bbdd84afce5ca9498f41063788a518ac3377a73d220df4f2e6366b9dc66526c97643d1d1c6406e42dfe6 WHIRLPOOL 236844bf23cdd117e145eeb098c306ac0e5e2104d0bc4478bfd799dcfe6047d8bed2004110a888d86a8ba877c97cd132a734846e7bc03e4a38702aca617d3384
+AUX gnome-control-center-3.16.0-networkmanager.patch 4043 SHA256 684e6c01bc2d61e3e6e750f4e11658970fe6e935f7156f4fbaf011669bc91391 SHA512 9d4341d3199a423d76001884c3a1c43b12f4de8341b4d9706b32e5ecdd08159195240e26fed050f16601994feb86125e22309c19addf9a9c96599c326085a848 WHIRLPOOL 2ed3478bbeb3335cb62272ab29cb0af7b9dd4b4cbe9fd0238a7044b04887f028a97e96edd6a4cb23c62b6493c073539e8b6245f09b8fdb7c73de8e09a858d49e
 DIST gnome-control-center-3.14.2.tar.xz 6938572 SHA256 b15e188b3d45c86d71f4d8cb297829cf190be81f22ce76dc74c7b4232bd0652a SHA512 c5bcdcae87f32cf4b0f9d99709dfe7fcb48e5086945d1685ce94c3996022ff5bf4c82994bbec28e0cf91c9c85309638225536e1dcca06b96cdbaf1ff38f2ae6b WHIRLPOOL 3188ff540a8a01a6479c529f4fe629d2b695b185f762291691a6aefd0f815af382afca2ed8c4ff56e4e5161b3cabe751d507625e4638856034982d2e408000a5
 DIST gnome-control-center-3.14.5.tar.xz 6984452 SHA256 66ffaf4b1eb0a745a2928035bc1b1e1eac7ea3775941e3a06bfb68ae4c1404c4 SHA512 ef9fa7a8d95bf37bce4e67521db7c35145f9de7bc9e5a9428d1aa0b0031698e38706529b509534e68dbc4cc8c54ba3482cf439e386fe64f3374432efa637512d WHIRLPOOL 15a83613f80cc3e236fd602d5c84a9a844a236de6556b742ee25147ccecfe207914cb2e4c1ac4029065a6bf19bd81ff8257cbd26163ad7df757849c2e0865f38
+DIST gnome-control-center-3.16.2.tar.xz 7027220 SHA256 2c2636af27a07a064669abdf79a8b0580a9a611fa4f108900167100473028a3d SHA512 29c7b87ac2f713a46e20e596f69b343e9d98991c3449e79eb3f77e5d0b14f5250902caa2e481192d6da77f22a309bb7ab5fe4e4eb3c2a9e92d8b672c6b99bb09 WHIRLPOOL e1deb4f228058d5d49c9592a9d4f219190bd8909cccf803a45df767311f3d38bf79d56893f2628475a9d807ef68d57176c89972ec4b63aa81c6d0a35b9d25d60
 EBUILD gnome-control-center-3.14.2-r1.ebuild 5131 SHA256 1f57155c7dae5f0db839f32aba875e4e23f89923273ec71d64bd448a6c320e81 SHA512 4d4013fdcee974cb36445cd980397fff4453734d79b80c21fa8a27dc5c977d0c90d762b4d488c334e764462ca2d525043c62e0c39433182f69f2ee80572785f8 WHIRLPOOL 1df36a1d6d08b325a6773f88c11dcc6e0dfe111f2dfb3e0c4bfdd9a7c7db0fc801f598340aad1d0b80a342f840e73e4cca264463ec77658cc7a33bcef7adf29c
 EBUILD gnome-control-center-3.14.5.ebuild 4286 SHA256 68f1d22818904b7f850ea0d0fa4622b81a51e04e96de5f9bfa169aa520b48291 SHA512 1e953fd6e876f22a3764b5e716284c0faf412d32e903f899f27ce3f0c88954d9907b1f80164f77b2be75269af70e601a5911f61d028214fefc1290bd8fddb3a3 WHIRLPOOL 7597a5b1abad066aca26f9bb478277cb39ad109987add0dd834b10a16a76e256ea7121cda0a8acb890189922a3a47c972091db25e84aa18cbf7ca5c64e785baf
-MISC ChangeLog 72045 SHA256 e9a30410703ac0b3643c43794c1a964286917e2cafc34a6002b9fffd55806431 SHA512 b4446e5644dd569c8133d1f153928a0f09ef9f9e17d68cde41869de8b813c8b91dd08ddc5341b8dd78dc1edf668d31b5a420230c8122368da4c2d9068b76bdb6 WHIRLPOOL c44b8698c0f0409e1d954bbf9805a3155d512f7f600e625e66a326983d0e6214b44722f1ec9a20fe7d970c7b687ae2d0c90937c0645e74691c0fa0783fd79cd9
+EBUILD gnome-control-center-3.16.2.ebuild 4771 SHA256 338945b1f51bc77e7f02ec058a97506feb4368cfaa4503c44adc18eb543f48cf SHA512 bc70b17fa96ed0b38b1bf082065627ff66d037f38dfed15756dcbf518b52a26259054d2e9ac24ce14739c7554d76e6bc7b5d90469925bc67908610775891e418 WHIRLPOOL 609333cdbf559f95d63c94afb5b0fba512b296c35cc5b3b19102efa2b36098457b28506f752130036cd9b263d5bda9696a583904ae8474d0950c9e1a1d0ac86e
+MISC ChangeLog 72425 SHA256 9d4f3d39967282dd5bea741fecd33a37f81c6a0081dc0033924d786031182299 SHA512 26004bac52d29445402bc4ca46302513f0538988838cc11cb9ec0dccdc9bf36ff1b72dc6eb6c574d4917ea5602d2ebacd80fac8c95f4cea902745ea3215de7e5 WHIRLPOOL d758fade4753d920b26cb73e761058d2679ae1cc16dca39331d1cb52c8e7e2335a6da8c28600da0d0a7934a58466727537cdcf27f65742e3649ff1d613c5109d
 MISC metadata.xml 498 SHA256 fb46c54dc3e3ce2c8297d67292cd0ecadbdadf8c22a50437f8a03fd5b6ec9dc2 SHA512 ae1ff3489b7d037af4d1a550538e0cadfa815f6afcaa76b73afb3fa7d87d888c1ae5b3642416e9eb0cf0c2ba4f70a5ed1f5a9ccbb1d63320fc444ac3c3aed2d3 WHIRLPOOL 94896b01f55c9a411cf85eda67cdebba03f2e32a723094f9f839e04c5096d09b63b4ac0895b7ddb70bc0ba3ef2ea4aeb6eba650e926fbaef155554a768fad970
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlVSSfsACgkQCaWpQKGI+9SGWQCggbE0i5U5duI+x3nH/shgRwPH
-OE0Amwc7s9TvpoXivsIpO/Tp8z6CQCQ2
-=Oyr1
+iEYEAREIAAYFAlV3CTIACgkQ1fmVwcYIWAaBXQCdERhU/779Ky4LZdiso2AoQc9X
+fRsAoJpElwe+dl556HMoSfkoMGdJJF4F
+=laKq
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.16.0-keep-panels-optional.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.16.0-keep-panels-optional.patch
new file mode 100644
index 000000000000..c991dc618cae
--- /dev/null
+++ b/gnome-base/gnome-control-center/files/gnome-control-center-3.16.0-keep-panels-optional.patch
@@ -0,0 +1,39 @@
+From 3b51af7de7bfe7b69bbb1a96dbbc184311281704 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Mon, 11 May 2015 23:59:03 +0200
+Subject: [PATCH 1/3] Optional gotta be optional
+
+---
+ configure.ac | 16 ----------------
+ 1 file changed, 16 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 9713256..bc239de 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -508,22 +508,6 @@ else
+         AC_MSG_RESULT(no)
+ fi
+ 
+-case $host_os in
+-  linux*)
+-    if test "$host_cpu" = s390 -o "$host_cpu" = s390x; then
+-      # Nothing
+-      echo "USB-related panels disabled on S390"
+-    else
+-      if test "x$have_networkmanager" != "xyes" -o
+-              "x$have_bluetooth" != "xyes" -o
+-              "x$enable_cups" != "xyes" -o
+-              "x$have_wacom" != "xyes"; then
+-        AC_MSG_ERROR([The Network, Bluetooth, Printers and Wacom panels are not optional on Linux systems])
+-     fi
+-    fi
+-    ;;
+-esac
+-
+ AC_CONFIG_FILES([
+ Makefile
+ panels/Makefile
+-- 
+2.3.6
+
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.16.0-make-wayland-optional.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.16.0-make-wayland-optional.patch
new file mode 100644
index 000000000000..38d4ccd30e43
--- /dev/null
+++ b/gnome-base/gnome-control-center/files/gnome-control-center-3.16.0-make-wayland-optional.patch
@@ -0,0 +1,44 @@
+From 95420469407223898564425b7622ac66e7ed70d5 Mon Sep 17 00:00:00 2001
+From: Ole Reifschneider <tranquility@gentoo.org>
+Date: Sat, 25 Apr 2015 22:22:09 +0200
+Subject: [PATCH] Make wayland support optional
+
+---
+ configure.ac | 21 +++++++++++++++------
+ 1 file changed, 15 insertions(+), 6 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 9713256..6b34962 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -231,12 +231,21 @@ if test "x$have_udev" = xyes ; then
+ fi
+ AM_CONDITIONAL(HAVE_UDEV, [test "x$have_udev" = "xyes"])
+
+-PKG_CHECK_MODULES(WAYLAND, gdk-wayland-3.0, have_wayland=yes, have_wayland=no)
+-if test "x$have_wayland" = xyes ; then
+-	if test "x$have_udev" != xyes ; then
+-		AC_MSG_ERROR([udev is required for Wayland support])
+-	fi
+-fi
++AC_ARG_ENABLE(
++  [wayland],
++  AS_HELP_STRING([--disable-wayland], [disable wayland support]),
++  [],
++  enable_wayland=auto
++)
++
++AS_IF([test "$enable_wayland" != "no"],
++      [
++        AS_IF([test "x$have_udev" = xno],
++              [AC_MSG_ERROR([udev is required for Wayland support])],
++              [AC_DEFINE(HAVE_UDEV, 1, [System has udev])])
++
++        PKG_CHECK_MODULES(WAYLAND, gdk-wayland-3.0)
++])
+
+ PKG_CHECK_MODULES(NETWORK_MANAGER, NetworkManager >= $NETWORK_MANAGER_REQUIRED_VERSION
+                   libnm-glib >= $NETWORK_MANAGER_REQUIRED_VERSION
+--
+2.0.5
+
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.16.0-networkmanager.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.16.0-networkmanager.patch
new file mode 100644
index 000000000000..8f704ac988e5
--- /dev/null
+++ b/gnome-base/gnome-control-center/files/gnome-control-center-3.16.0-networkmanager.patch
@@ -0,0 +1,83 @@
+From 763cc368b529c879050ffb98340779148e152b29 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Tue, 12 May 2015 00:32:11 +0200
+Subject: [PATCH 3/3] Make network panel optional
+
+---
+ configure.ac | 60 ++++++++++++++++++++++++++++++++++--------------------------
+ 1 file changed, 34 insertions(+), 26 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 7816942..13e8f45 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -247,32 +247,40 @@ AS_IF([test "$enable_wayland" != "no"],
+         PKG_CHECK_MODULES(WAYLAND, gdk-wayland-3.0)
+ ])
+ 
+-PKG_CHECK_MODULES(NETWORK_MANAGER, NetworkManager >= $NETWORK_MANAGER_REQUIRED_VERSION
+-                  libnm-glib >= $NETWORK_MANAGER_REQUIRED_VERSION
+-                  libnm-glib-vpn >= $NETWORK_MANAGER_REQUIRED_VERSION
+-                  libnm-util >= $NETWORK_MANAGER_REQUIRED_VERSION
+-                  libnm-gtk >= $NETWORK_MANAGER_APPLET_REQUIRED_VERSION
+-                  mm-glib >= $MODEM_MANAGER_REQUIRED_VERSION,
+-                  [have_networkmanager=yes], have_networkmanager=no)
+-if test "x$have_networkmanager" = xno ; then
+-        AC_MSG_WARN(*** Network panel will not be built (NetworkManager or ModemManager not found) ***)
+-else
+-	AC_DEFINE(BUILD_NETWORK, 1, [Define to 1 to build the Network panel])
+-fi
+-AM_CONDITIONAL(BUILD_NETWORK, [test x$have_networkmanager = xyes])
+-if test x${have_networkmanager} = xyes; then
+-  AC_DEFINE(HAVE_NETWORK_MANAGER, 1, [Define to 1 if NetworkManager is available])
+-  NM_VPN_CONFIG_DIR=`$PKG_CONFIG --variable configdir NetworkManager`/VPN
+-  NM_VPN_MODULE_DIR=`$PKG_CONFIG --variable plugindir NetworkManager`
+-  AC_SUBST(NM_VPN_CONFIG_DIR)
+-  AC_SUBST(NM_VPN_MODULE_DIR)
+-fi
+-
+-# Work-around for https://bugzilla.gnome.org/show_bug.cgi?id=723769
+-PKG_CHECK_MODULES(NM_UNSTABLE_CHECK, libnm-util >= 0.9.9.0, nm_unstable=yes, nm_unstable=no)
+-if test x$nm_unstable = xyes; then
+-  AC_DEFINE(HAVE_NM_UNSTABLE, 1, [Define to 1 if NetworkManager is available])
+-fi
++AC_ARG_ENABLE([networkmanager],
++              AS_HELP_STRING([--disable-networkmanager], [Disable network panel]),
++              [], [enable_networkmanager=auto])
++AS_IF([test "$enable_networkmanager" != "no"],
++      [
++        PKG_CHECK_MODULES(NETWORK_MANAGER, NetworkManager >= $NETWORK_MANAGER_REQUIRED_VERSION
++                          libnm-glib >= $NETWORK_MANAGER_REQUIRED_VERSION
++                          libnm-glib-vpn >= $NETWORK_MANAGER_REQUIRED_VERSION
++                          libnm-util >= $NETWORK_MANAGER_REQUIRED_VERSION
++                          libnm-gtk >= $NETWORK_MANAGER_APPLET_REQUIRED_VERSION
++                          mm-glib >= $MODEM_MANAGER_REQUIRED_VERSION,
++                          [have_networkmanager=yes], have_networkmanager=no)
++
++        AS_IF([test "$have_networkmanager" = "no"],
++              [
++                AC_MSG_WARN([*** Network panel will not be built (NetworkManager or ModemManager not found) ***])
++              ], [
++                AC_DEFINE(BUILD_NETWORK, 1, [Define to 1 to build the Network panel])
++                AC_DEFINE(HAVE_NETWORK_MANAGER, 1, [Define to 1 if NetworkManager is available])
++                NM_VPN_CONFIG_DIR=`$PKG_CONFIG --variable configdir NetworkManager`/VPN
++                NM_VPN_MODULE_DIR=`$PKG_CONFIG --variable plugindir NetworkManager`
++                AC_SUBST([NM_VPN_CONFIG_DIR])
++                AC_SUBST([NM_VPN_MODULE_DIR])
++              ])
++
++        # Work-around for https://bugzilla.gnome.org/show_bug.cgi?id=723769
++        PKG_CHECK_MODULES(NM_UNSTABLE_CHECK, [libnm-util >= 0.9.9.0],
++                          [
++                            nm_unstable=yes
++                            AC_DEFINE(HAVE_NM_UNSTABLE, 1, [Define to 1 if NetworkManager is available])
++                          ],
++                          [nm_unstable=no])
++      ])
++AM_CONDITIONAL(BUILD_NETWORK, [test "$have_networkmanager" = "yes"])
+ AM_CONDITIONAL(HAVE_NM_UNSTABLE, [test x$nm_unstable = xyes])
+ 
+ # Check for gnome-bluetooth
+-- 
+2.3.6
+
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.16.2.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.16.2.ebuild
new file mode 100644
index 000000000000..df945f5d637d
--- /dev/null
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.16.2.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/gnome-control-center-3.16.2.ebuild,v 1.1 2015/06/09 15:41:36 eva Exp $
+
+EAPI="5"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+
+inherit autotools bash-completion-r1 eutils gnome2
+
+DESCRIPTION="GNOME's main interface to configure various aspects of the desktop"
+HOMEPAGE="https://git.gnome.org/browse/gnome-control-center/"
+
+LICENSE="GPL-2+"
+SLOT="2"
+IUSE="+bluetooth +colord +cups +gnome-online-accounts +i18n input_devices_wacom kerberos networkmanager v4l wayland"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+
+# False positives caused by nested configure scripts
+QA_CONFIGURE_OPTIONS=".*"
+
+# gnome-session-2.91.6-r1 is needed so that 10-user-dirs-update is run at login
+# g-s-d[policykit] needed for bug #403527
+
+# kerberos unfortunately means mit-krb5; build fails with heimdal
+
+# udev could be made optional, only conditions gsd-device-panel
+# (mouse, keyboards, touchscreen, etc)
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.39.91:2[dbus]
+	>=x11-libs/gdk-pixbuf-2.23.0:2
+	>=x11-libs/gtk+-3.15:3[X,wayland?]
+	>=gnome-base/gsettings-desktop-schemas-3.15.4
+	>=gnome-base/gnome-desktop-3.11.3:3=
+	>=gnome-base/gnome-settings-daemon-3.8.3[colord?,policykit]
+
+	>=dev-libs/libpwquality-1.2.2
+	dev-libs/libxml2:2
+	gnome-base/libgtop:2=
+	media-libs/fontconfig
+
+	>=media-libs/libcanberra-0.13[gtk3]
+	>=media-sound/pulseaudio-2[glib]
+	>=sys-auth/polkit-0.97
+	>=sys-power/upower-0.99:=
+	>=x11-libs/libnotify-0.7.3:0=
+
+	virtual/libgudev
+	virtual/opengl
+	x11-apps/xmodmap
+	x11-libs/cairo
+	x11-libs/libX11
+	x11-libs/libXxf86misc
+	>=x11-libs/libXi-1.2
+
+	bluetooth? ( >=net-wireless/gnome-bluetooth-3.11.1:= )
+	colord? (
+		net-libs/libsoup:2.4
+		>=x11-misc/colord-0.1.34:0=
+		>=x11-libs/colord-gtk-0.1.24 )
+	cups? (
+		>=net-print/cups-1.4[dbus]
+		|| ( >=net-fs/samba-3.6.14-r1[smbclient] >=net-fs/samba-4.0.0[client] ) )
+	gnome-online-accounts? (
+		>=media-libs/grilo-0.2.6:0.2
+		>=net-libs/gnome-online-accounts-3.15.1 )
+	i18n? ( >=app-i18n/ibus-1.5.2 )
+	kerberos? ( app-crypt/mit-krb5 )
+	networkmanager? (
+		>=gnome-extra/nm-applet-0.9.7.995
+		>=net-misc/networkmanager-0.9.8[modemmanager]
+		>=net-misc/modemmanager-0.7.990 )
+	v4l? (
+		media-libs/gstreamer:1.0
+		media-libs/clutter-gtk:1.0
+		>=media-video/cheese-3.5.91 )
+	input_devices_wacom? (
+		>=dev-libs/libwacom-0.7
+		>=media-libs/clutter-1.11.3:1.0
+		media-libs/clutter-gtk:1.0
+		>=x11-libs/libXi-1.2 )
+"
+# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
+# libgnomekbd needed only for gkbd-keyboard-display tool
+RDEPEND="${COMMON_DEPEND}
+	|| ( ( app-admin/openrc-settingsd sys-auth/consolekit ) >=sys-apps/systemd-31 )
+	>=sys-apps/accountsservice-0.6.39
+	x11-themes/gnome-icon-theme-symbolic
+	colord? ( >=gnome-extra/gnome-color-manager-3 )
+	cups? (
+		|| ( >=app-admin/system-config-printer-gnome-1.3.5
+			app-admin/system-config-printer )
+		net-print/cups-pk-helper )
+	input_devices_wacom? ( gnome-base/gnome-settings-daemon[input_devices_wacom] )
+	i18n? ( >=gnome-base/libgnomekbd-3 )
+
+	!<gnome-base/gdm-2.91.94
+	!<gnome-extra/gnome-color-manager-3.1.2
+	!gnome-extra/gnome-media[pulseaudio]
+	!<gnome-extra/gnome-media-2.32.0-r300
+	!<net-wireless/gnome-bluetooth-3.3.2
+"
+# PDEPEND to avoid circular dependency
+PDEPEND=">=gnome-base/gnome-session-2.91.6-r1"
+
+DEPEND="${COMMON_DEPEND}
+	x11-proto/xproto
+	x11-proto/xf86miscproto
+	x11-proto/kbproto
+
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	>=dev-util/intltool-0.40.1
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+
+	gnome-base/gnome-common
+"
+# Needed for autoreconf
+#	gnome-base/gnome-common
+
+src_prepare() {
+	# Make some panels and dependencies optional; requires eautoreconf
+	# https://bugzilla.gnome.org/686840, 697478, 700145
+	epatch "${FILESDIR}"/${PN}-3.14.0-optional.patch
+	epatch "${FILESDIR}"/${PN}-3.16.0-make-wayland-optional.patch
+	epatch "${FILESDIR}"/${PN}-3.16.0-keep-panels-optional.patch
+	epatch "${FILESDIR}"/${PN}-3.16.0-networkmanager.patch
+
+	# Fix some absolute paths to be appropriate for Gentoo
+	epatch "${FILESDIR}"/${PN}-3.10.2-gentoo-paths.patch
+
+	epatch_user
+
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-update-mimedb \
+		--disable-static \
+		--enable-documentation \
+		$(use_enable bluetooth) \
+		$(use_enable colord color) \
+		$(use_enable cups) \
+		$(use_enable gnome-online-accounts goa) \
+		$(use_enable i18n ibus) \
+		$(use_enable kerberos) \
+		$(use_enable networkmanager) \
+		$(use_with v4l cheese) \
+		$(use_enable input_devices_wacom wacom) \
+		$(use_enable wayland)
+}
+
+src_install() {
+	gnome2_src_install completiondir="$(get_bashcompdir)"
+}
diff --git a/gnome-base/gnome-desktop/ChangeLog b/gnome-base/gnome-desktop/ChangeLog
index 81c8fd146495..583708c97844 100644
--- a/gnome-base/gnome-desktop/ChangeLog
+++ b/gnome-base/gnome-desktop/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-base/gnome-desktop
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-desktop/ChangeLog,v 1.341 2015/04/08 18:13:25 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-desktop/ChangeLog,v 1.342 2015/06/09 15:41:38 eva Exp $
+
+*gnome-desktop-3.16.2 (09 Jun 2015)
+
+  09 Jun 2015; Gilles Dartiguelongue <eva@gentoo.org>
+  -gnome-desktop-3.12.2.ebuild, +gnome-desktop-3.16.2.ebuild:
+  Version bump for Gnome 3.16. Clean up old revision.
 
   08 Apr 2015; Michał Górny <mgorny@gentoo.org> gnome-desktop-2.32.1-r2.ebuild:
   Drop old Python implementations
diff --git a/gnome-base/gnome-desktop/Manifest b/gnome-base/gnome-desktop/Manifest
index 956f562266a5..1b3b67afb3f7 100644
--- a/gnome-base/gnome-desktop/Manifest
+++ b/gnome-base/gnome-desktop/Manifest
@@ -4,29 +4,17 @@ 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.12.2.tar.xz 1093876 SHA256 b7d691363ccc90182caff1980efa7d99e4569bea968d39654102a0c4e824a44d SHA512 14e40c15daaab943bf0b7e94bb2fe98a2a519bd3ea99bad989353cc8144c3c9fa7daf3f5fae5a5348e998d27e0ae1014ba84dac1ad70fb6797a49e9a4f91f564 WHIRLPOOL 2062df11698923b48863c1fdd6144e6fcdca484722e1745b0819bd9ba1f49755e088ac34709ed5e2ca4d7e3f2ea73b2fe46a9666594e0bbbbcf0a76887d6850d
 DIST gnome-desktop-3.14.2.tar.xz 1105916 SHA256 3c284378fd4d5c9aba1ef98b8bab78d0f7fe514964f9dfcfc3b1591328d6b873 SHA512 f6b07219cd99f2b891d6a887380f05c5775a85bac74f545ab94fa1c1758aee2a9839aaa10d313f8b3806e36a0e554ef336cf5176c424618d79e954c892cf1ac3 WHIRLPOOL 122c7bd2bd7d06b278a034ddc413b61188603b36c9880788226fd9f8394a80d7f88aed1c8c880388a024c60bd0f46514a597fc163f5a8445d41a6770b7f84864
+DIST gnome-desktop-3.16.2.tar.xz 1078328 SHA256 3a8f196b46eb9dbd3ba2afb8fb5fef6a8825539d449a02181311242e22227bd0 SHA512 0b82cfd19fb38926313c5bb92061770a4242da87b0da4281d23d5bf7e566c3470f42c71f5d05b6913e16594d3ced331131fe7076e4fcd13319ef139a5265246c WHIRLPOOL 342b988422c7bbdc1d442e238e50f6e61bb18b5fc3ea03dc3fa326badda41d8ee6a917edc9a5e4d90b056ac3bc9a4b8dc0ce616e0b2b570727199a86efad971c
 EBUILD gnome-desktop-2.32.1-r2.ebuild 2426 SHA256 d1aebb336e6b3bf6a9fa734152fa33b88d96cda45ab9e2f7ec986e3e966fb443 SHA512 f05f98e1980e7b205b15f450e78f1106d5eb39a99fa2cc7cd52e32eee33cb5673a8cdb12c2affa2e71d4c03a507cc71575f8a1cdd0032bd770e871d16b693f15 WHIRLPOOL e941aaaaa89b1e03420a28e802624126b7a1ce8c0473007630b6dfad0818de14d903d1ab4d3c3114c7fe7413d3a92f734995229e66801c3c77fa3a95e4469389
-EBUILD gnome-desktop-3.12.2.ebuild 2032 SHA256 55385da5591a95c0c92ee88bc8b00400a6dfc917da56c65458e7e22be68a0f22 SHA512 2c63130ca04abc64d614bd8bda88fc02d854859a4103f25f56a5c1959c215af3b5743a29ef0b3527c6266d960e10cfba8c75461583845192ef1a7f3fe8832fb7 WHIRLPOOL 1d26762abbb63e7557626cc830808c529e0a06144bd21274dce3b96471adc27f920219c31eff014d91f1addc8aa659b8e000ecee58a09ec929a04883066b6b5a
 EBUILD gnome-desktop-3.14.2.ebuild 2156 SHA256 f4c15a28bdfb98188b0535adc0890617bc88ce4104dd12caa1c3a264100bf1ed SHA512 78ec86f2a18fea22180de8884c29ef4c99a5a6572f11d6881ed139c1af02c82ea760724d4ae1e734ddbfb3129d1411ca9f92dc073c66fea7f54137f807bef429 WHIRLPOOL 34502852f9e6bc1a205790d5dadb6b75988930489b721aea1f1a00af8205e623b4395ab2d04b1c480c6da0e58035981434ea216e477b11198250ea1e1cee19e5
-MISC ChangeLog 46294 SHA256 8bd94ce6829c82c1adb8970afab70334bd22844feb1bea328b4b62032b0b49e3 SHA512 8e6007de18a2416698223ff412f003624e900c52eae3a8aa6c17bfb5c961e85c7740742254317d82ac4131662b6c4c47b222e476c52d73c9c5e688e2c5ce8537 WHIRLPOOL a2a4cbf780fa9566d94474bcd3a5efc890025fe0ae504446c8d90bf3643709fd6c89b3555934755eaa0ae9df47c7cdbf41c64301f3c6ecddd2630b9bb1ae5788
+EBUILD gnome-desktop-3.16.2.ebuild 2072 SHA256 c5f9851e661f8de1447fae2b710853035849a85360e139ab38b268bb19892581 SHA512 22636f2d8716e297b680f015c63b0c483f9521131adaf0bbb72bd92839f4c45535e4c2e3a4c94c57195bf3c793af715cbad43eba1691ab6a04ad1d67313667ac WHIRLPOOL 063ccd0edcf42f591741685c4e848043d128a464fef8d1945195f3914b47a42f2aaee83a5b2feb185dabf87bae1cb76d0866de4e25770205c77727bda69e1ebd
+MISC ChangeLog 46499 SHA256 b4720086abde58eeb9f46533ec39e252efb8b384bf3e4eebb1840f6d334ebf37 SHA512 3e9382a43e803b8dfe1a83ef1500f5848e10fef562be1b03b493bc4cd14db992fe4b8488fbd07e5a472865bd333b17392cc0e451a3957ada8231528e379dd4d6 WHIRLPOOL c6c4c1ae6b7c2bb572b84816104cb1bf100f64799d4c63730c3567c42e96693cc42f994aa7b485a9eea20b3d7ff4d885efcd1244f7b7379e34982c755c5ba1d4
 MISC metadata.xml 260 SHA256 963e6a57764d4be649262b46c80463a08be9f9d17442becdc59b6bb93991ba6b SHA512 953029172fb8243080bf818a116de3318527568efde018ef9fcd00ca64664041a110a6a9d083f7537985b97bcc3f0c4cd2638dd829924dcdea2248147e8a8625 WHIRLPOOL 4b49b8d1aeec77e2f6716e2aaa8ba84d88e7d521e415802aad82857d0c46a63fc902467d56ae3dd89cb147c7bfa337c88d76bedf64ed11b832fd6397a1439336
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJVJW/IXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOtoIP/RCDDqjN4HOTnxXxmqq9XPNt
-OomRDSDoKadi893ZcW39jf1qXPW1rl1/eUt6shqoYa9xnez9WrJUsXcZu58q7ns9
-q9EfJ5jcIUIeUpiEi/s+zQZh1BKdRw6bJPVGybQBkxzyjjDRYeXMrZ5dJAQWzMvM
-tgCLIocLh0hDW3PVuVKNmt5/lVGGipTm9b0y49KtZuTAej+zV797vqtATFZ+OLLu
-FgxCSYoVpXlyjBD8jBUh3NbaNgrkQgC3AqrVhYsjyzbK0QDyvl2S22Dq0iupYh95
-o3a48OdGraxSK4p1Q0TRgVwas3usnaCyM4q2BVId0eVxa2TNbCN1C6drJibeVjeL
-2R/s1uEBDcMrecMdNgUqqqNDJ/4dXRRAzUue6yogINqYLFW/MmCXgdmTLSKLyN72
-WVQkfEBJvFcfZR5c1ZHbmj5YfQjdBPahttfXCoz9lUWjs3+CKz/oqBJs1PwbR0Ev
-CdOkojI5VJnj2N9WFj3IWcT7Hd044EjnD+uDCDLqewV9KlYjpVAKr7WfTDJlIv/q
-5taf06wnnM1aqh5FsClV3E9CmDhT8SuNfNjCrJpkHZWZuLuPhb/01JXhmlw2ILXS
-E7iFoqXPtgWfkYStkMqjb6WM6qhJh8tFxEUgf37Bd6vEKhFLDai/05H7b0u/r2WJ
-8rdTl41MBY67zMc78Ni4
-=SyCQ
+iEYEAREIAAYFAlV3CTMACgkQ1fmVwcYIWAadZQCbBuy16YZXUGfg0kt7/3N9Zr1J
+lvIAoOy/zbzACIXoNoB7MBXj4Xn7XPQJ
+=1yiy
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.12.2.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.16.2.ebuild
index 632d051183fd..dc93f0ace3b7 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-3.12.2.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-3.16.2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 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.12.2.ebuild,v 1.4 2014/09/29 11:59:12 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-desktop/gnome-desktop-3.16.2.ebuild,v 1.1 2015/06/09 15:41:38 eva Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"
 
-inherit gnome2
+inherit gnome2 virtualx
 
 DESCRIPTION="Libraries for the gnome desktop that are not part of the UI"
 HOMEPAGE="https://git.gnome.org/browse/gnome-desktop"
@@ -13,12 +13,12 @@ HOMEPAGE="https://git.gnome.org/browse/gnome-desktop"
 LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
 SLOT="3/10" # 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"
+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
+	>=dev-libs/glib-2.38:2
 	>=x11-libs/gdk-pixbuf-2.21.3:2[introspection?]
 	>=x11-libs/gtk+-3.3.6:3[introspection?]
 	>=x11-libs/libXext-1.1
@@ -35,7 +35,7 @@ RDEPEND="${COMMON_DEPEND}
 DEPEND="${COMMON_DEPEND}
 	app-text/docbook-xml-dtd:4.1.2
 	dev-util/gdbus-codegen
-	>=dev-util/gtk-doc-am-1.4
+	>=dev-util/gtk-doc-am-1.14
 	>=dev-util/intltool-0.40.6
 	sys-devel/gettext
 	x11-proto/xproto
@@ -59,3 +59,7 @@ src_configure() {
 		$(use_enable introspection) \
 		ITSTOOL=$(type -P true)
 }
+
+src_test() {
+	Xemake check
+}
diff --git a/gnome-base/gvfs/ChangeLog b/gnome-base/gvfs/ChangeLog
index 8de443e99f99..ecc440a2be44 100644
--- a/gnome-base/gvfs/ChangeLog
+++ b/gnome-base/gvfs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-base/gvfs
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/ChangeLog,v 1.289 2015/06/07 10:36:11 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/ChangeLog,v 1.290 2015/06/09 15:38:58 eva Exp $
+
+*gvfs-1.24.1 (09 Jun 2015)
+
+  09 Jun 2015; Gilles Dartiguelongue <eva@gentoo.org> +gvfs-1.24.1.ebuild,
+  metadata.xml:
+  Version bump for Gnome 3.16. Clean up old revision.
 
   07 Jun 2015; Markus Meier <maekke@gentoo.org> gvfs-1.22.3.ebuild:
   arm stable, bug #534012
diff --git a/gnome-base/gvfs/Manifest b/gnome-base/gvfs/Manifest
index 0f78449bed81..27ceca29e9dd 100644
--- a/gnome-base/gvfs/Manifest
+++ b/gnome-base/gvfs/Manifest
@@ -5,15 +5,17 @@ AUX gvfs-1.22.4-fix-parallel.patch 855 SHA256 08d35ee0b2370e678febbb3ebb4ddb2152
 DIST gvfs-1.20.3.tar.xz 1558028 SHA256 646b1906b1c85876fa07299246855f16836080466dde1826003bbbd4b9415cba SHA512 3a975b2014d7d82ec76062624343df4514d46a537cdcb3daf1cee2f77b7e0e06db123d3fb0de44987dc147c4023d2cfa9e46786378b1390d5957c16f4f14155e WHIRLPOOL 90285449626ffc284c798256f965188c3614efee6c1118bbaf1f8e178450e2bd8ddd9ec6d4f3e979ab6a789317848aae1afb3af9e3c3531af8865e99a90438f7
 DIST gvfs-1.22.3.tar.xz 1588072 SHA256 c778342e09a84d8c69b1b7ce7f943f6f2444a995bb0c0754ef1746afa8935182 SHA512 17e79047ce8f979ae15c99423ddc6d50a1d276151d4c0e1cc7e0c4958e0a9ed8bc4c0db8a38272eab50922bad6a51d915a2cd4cf41dfb0873faa49e1a3028ba7 WHIRLPOOL 2de23d3537683fcdb0af2fac42c98e05daf9cf4f5fb0d9e05dfa7b25e03852f2774ba1a1cfbebbd0602bbbbcbdbe36279dd9de6328fb3f495e2209c246b8a70a
 DIST gvfs-1.22.4.tar.xz 1598264 SHA256 57e33faad35aba72be3822099856aca847f391626cf3ec734b42e64ba31f6484 SHA512 5485a46284b62f19f6c289a5e341f4f0a48c3b8b42cdc5e8b4f9070b1b33e781ada8a4fbb718f5305cdeaa287d122718ea2826a52cc4ebae090cbbc519e758d8 WHIRLPOOL f0b6514241616e64ad45d8ce163d2ba2ca293d60a2ab65210cff4f9338f7f37e0d8beb3ae367c73ab2ed8d046dc4788535c00f973fa05df1e2dde8c294509e9c
+DIST gvfs-1.24.1.tar.xz 1624212 SHA256 d38367ce189415c36fd19dca478bc9b80694b495c3458e74fb0f13d1ac9df1f9 SHA512 f4208e38a7a6a9c7c994bde62d6499e9eb327c7b85dd6bec46e22aa5c3423214eb5ff2092c7cc3945e28c7a7d2c1bcb5cc9e29df67c9b601fbf9e7b9092de95f WHIRLPOOL 96f178f91502165fc3f3b5ea800a2cbaa88baad6f692017745fbd6cb81f3c1ad405a0d342641a9a94c567400bfcdf061cd4aa6bac76c29106f5cd30f79b0021e
 EBUILD gvfs-1.20.3.ebuild 3464 SHA256 d6073836bfcdac9b79f9ca18b2e5ddaf34786e78711c8972965cd029573c788f SHA512 be17f1d27299f638fbd457c921883720964332d462e68d42d0a6aac478f6442ea2d17b3b3f8eeb79b7459f3e696e988d235ea1f17e1ee83d8cf1f4a87f5a4702 WHIRLPOOL 0c892cc14fcfc70b36d5af5864b9deb6578995069c10cdba1bdbb9baf35df6631d92d508ad5c0624a54915a88babdb00290f861382fa10c5916bc9cf1e79dd1c
 EBUILD gvfs-1.22.3.ebuild 3485 SHA256 b87ae3133504e6299a15a557217b41859d6f00f45422a5408e7173ca07e75e7c SHA512 5363ffba5350f21536269c120e263a644e5f1513c1389ce813bdb29a25d5c00df5ab01a2172003aefcfbb6f220248845721bc51e456dd61ea8f63ac3cfce6ec2 WHIRLPOOL 26af9257db3b3ffa543178c0c8e8c0f6911e334a221c8d83fdfeb5568a9a594fa0bb379272bc5ad638ce73f842487213b603e08e92cf1526f69d1777fad9ca4a
 EBUILD gvfs-1.22.4.ebuild 3673 SHA256 87f2bc5bc79578d3cbc2ec3dc2ce375014183613f9349333fca24188b6bcb86e SHA512 ddd55df8d9b17256e7d585af66fce84777b4879550376b59678c2b35d109f65e9c98d9b941731ccf86c70dc022565c58afef13de4dc3956b108300af8dfbdef7 WHIRLPOOL fce250ba496ed6dd8e21c938fe691cf8e0e6d54b72ce42343f3d21ffbbf06ad23353902c0620ebc01213b62e9ea95ae3a679928cfa4e91f80cb63a9a78a050e2
-MISC ChangeLog 40339 SHA256 ebd4f26e8e1f61017dbd2b53b0354f28001651926cbf90f74d7f0bfeff7ed737 SHA512 cd4937922d6b84ce94608fb5ab13649b9b738233a2796b5eb1989595143337cb6e5484b350fc9ec406e0569a1578859e3bec27a9b4930e80159a58156795ee3f WHIRLPOOL 508a1ec5df6e289eb2153a2367c1636be6bdd9484e068c947d0cd98fc45a24824520244234883b351985f025946a61379d004317e1e995e4db278f0084d77097
-MISC metadata.xml 1371 SHA256 0d15d1c36cf3b9ba1e35e4ecb16542410edf0b1c1c83f74d76a9ddc3da40abc8 SHA512 008e52b6d717f465bb275d72fc8076c8e65362dd9e769305205693cf42d2b2bdcab66abdf15dfab89bcc97b938d7ce5248048d60d1bad1915dbd32106b411b98 WHIRLPOOL 0be1ef0c90e36b97103dd3d6938f23f4334eda971b55137db157efa02d2bc0a25e6e4b920ca9bba544ce40cd1e08772374264a7b5805c740c296d35fb77b228f
+EBUILD gvfs-1.24.1.ebuild 3564 SHA256 187564a0a773ef686236b17b5754c9c2207a104375fe87129cf9f8161eac7463 SHA512 e09399efcebc9299b4e83b4b89ed4f037c79888c984e4ca7f4dcb1f96ce37aaa9fb298179577af54beaf0ee48b28e856dddcd32de6e2a4c15e150f17b2196f1a WHIRLPOOL 673a1e81a1c93a3f0f048525c60687c955e737ea1f45e13b7ae9f18d1fd900251630e4ea2f94122704bf7196b28c17cc28303a5ef5e27641290810ff19e9b141
+MISC ChangeLog 40510 SHA256 08f4a0a129132bbcfbac1a5d00a3d8c1fe6956b63d33b48d94e485bce40ead24 SHA512 d816c4de946da27189866156a67d20f702e6ebea3a7315ded2494092839900b44767e8669655bdfdd26c846dd17d6226921a44d00f154b57b659468496f53267 WHIRLPOOL e568095f01a7f3ed9db07bacfc1bde64f2ba8ffc33b9726f8010689d16b1964082fca0d55ca7a96e0b93007877ded59a6a11b4c1d7a59c6be531ead38b9f0882
+MISC metadata.xml 1452 SHA256 a813273153cdc1565e4d52e101dae06b5fe0b40755b1a93a62710c5267ae4f86 SHA512 e5118c61456664e21650cf0caf6c33a34fcba0bb9dc98660bcb9e82eee74ab3a0a2d8f7ba30a9c1c013006b9fe95a26fbeb77ef30cc85cefa2dacd122dfebc9a WHIRLPOOL cc6934771e8289c4d30636cf047117125701bfac5403274954db82482720cbc17a60805bdfba5f5b7f4ff3b3a5dc32caee4428a6d330c924597d09935580b257
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlV0HpwACgkQkKaRLQcq0GKIYQCeL+5bp/VRdniLy6it7o/pVdYl
-JlsAoKC4GhwjOPJ8UDG/YeOORnuVAYRt
-=B6j6
+iEYEAREIAAYFAlV3CJMACgkQ1fmVwcYIWAadpACgpaIuvyuFDWja6Wg/ykD7DJde
+APUAn2V28u/lf4HEB6fRMGN4WwgYVoBR
+=icQj
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gvfs/gvfs-1.24.1.ebuild b/gnome-base/gvfs/gvfs-1.24.1.ebuild
new file mode 100644
index 000000000000..cb0b94bc9a74
--- /dev/null
+++ b/gnome-base/gvfs/gvfs-1.24.1.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-1.24.1.ebuild,v 1.1 2015/06/09 15:38:58 eva Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit autotools bash-completion-r1 eutils gnome2
+
+DESCRIPTION="Virtual filesystem implementation for gio"
+HOMEPAGE="https://git.gnome.org/browse/gvfs"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+
+IUSE="afp archive bluray cdda fuse gnome-online-accounts gphoto2 gtk +http ios libsecret mtp nfs samba systemd test +udev udisks zeroconf"
+REQUIRED_USE="
+	cdda? ( udev )
+	mtp? ( 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"
+
+# Can use libgphoto-2.5.0 as well. Automagic detection.
+RDEPEND="
+	>=dev-libs/glib-2.43.2:2
+	sys-apps/dbus
+	dev-libs/libxml2:2
+	net-misc/openssh
+	afp? ( >=dev-libs/libgcrypt-1.2.2:0= )
+	archive? ( app-arch/libarchive:= )
+	bluray? ( media-libs/libbluray )
+	fuse? ( >=sys-fs/fuse-2.8.0 )
+	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-2.42:2.4 )
+	ios? (
+		>=app-pda/libimobiledevice-1.1.5:=
+		>=app-pda/libplist-1:= )
+	libsecret? ( app-crypt/libsecret )
+	mtp? ( >=media-libs/libmtp-1.1.6 )
+	nfs? ( >=net-fs/libnfs-1.9.7 )
+	samba? ( || ( >=net-fs/samba-3.4.6[smbclient] >=net-fs/samba-4[client] ) )
+	systemd? ( sys-apps/systemd:0= )
+	udev? (
+		cdda? ( dev-libs/libcdio-paranoia )
+		virtual/libgudev:=
+		virtual/libudev:= )
+	udisks? ( >=sys-fs/udisks-1.97:2 )
+	zeroconf? ( >=net-dns/avahi-0.6 )
+"
+DEPEND="${RDEPEND}
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	>=dev-util/intltool-0.40
+	virtual/pkgconfig
+	dev-util/gdbus-codegen
+	dev-util/gtk-doc-am
+	test? (
+		>=dev-python/twisted-core-12.3.0
+		|| (
+			net-analyzer/netcat
+			net-analyzer/netcat6 ) )
+	!udev? ( >=dev-libs/libgcrypt-1.2.2:0 )
+"
+# libgcrypt.m4, provided by libgcrypt, needed for eautoreconf, bug #399043
+# test dependencies needed per https://bugzilla.gnome.org/700162
+
+# Tests with multiple failures, this is being handled upstream at:
+# https://bugzilla.gnome.org/700162
+RESTRICT="test"
+
+src_prepare() {
+	DOCS="AUTHORS ChangeLog NEWS MAINTAINERS README TODO" # ChangeLog.pre-1.2 README.commits
+
+	if ! use udev; then
+		sed -e 's/gvfsd-burn/ /' \
+			-e 's/burn.mount.in/ /' \
+			-e 's/burn.mount/ /' \
+			-i daemon/Makefile.am || die
+
+		# Uncomment when eautoreconf stops being needed always
+		eautoreconf
+	fi
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# --enable-documentation installs man pages
+	# --disable-obexftp, upstream bug #729945
+	gnome2_src_configure \
+		--enable-bash-completion \
+		--with-bash-completion-dir="$(get_bashcompdir)" \
+		--disable-gdu \
+		--disable-hal \
+		--disable-obexftp \
+		--with-dbus-service-dir="${EPREFIX}"/usr/share/dbus-1/services \
+		--enable-documentation \
+		$(use_enable afp) \
+		$(use_enable archive) \
+		$(use_enable bluray) \
+		$(use_enable cdda) \
+		$(use_enable fuse) \
+		$(use_enable gnome-online-accounts goa) \
+		$(use_enable gphoto2) \
+		$(use_enable gtk) \
+		$(use_enable ios afc) \
+		$(use_enable mtp libmtp) \
+		$(use_enable nfs) \
+		$(use_enable udev) \
+		$(use_enable udev gudev) \
+		$(use_enable http) \
+		$(use_enable libsecret keyring) \
+		$(use_enable samba) \
+		$(use_enable systemd libsystemd-login) \
+		$(use_enable udisks udisks2) \
+		$(use_enable zeroconf avahi)
+}
diff --git a/gnome-base/gvfs/metadata.xml b/gnome-base/gvfs/metadata.xml
index 0e94e8959b13..93e236daeec9 100644
--- a/gnome-base/gvfs/metadata.xml
+++ b/gnome-base/gvfs/metadata.xml
@@ -17,6 +17,7 @@ applications not using gio to access the gvfs filesystems.
 	<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="nfs">Enable NFS client support via <pkg>net-fs/libnfs</pkg>.</flag>
 	<flag name='udev'>Enable udev base replacement code for cdda feature</flag>
 </use>
 </pkgmetadata>