Version bump for Gnome 3.8

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

18 files changed, 1226 insertions, 36 deletions

diff --git a/gnome-base/gdm/ChangeLog b/gnome-base/gdm/ChangeLog
index e7444fdc0ec1..d6868a503512 100644
--- a/gnome-base/gdm/ChangeLog
+++ b/gnome-base/gdm/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-base/gdm
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.369 2013/03/14 04:32:36 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.370 2013/03/28 22:47:35 pacho Exp $
+
+*gdm-3.8.0 (28 Mar 2013)
+
+  28 Mar 2013; Pacho Ramos <pacho@gentoo.org>
+  +files/gdm-3.7.3.1-disable-accessibility.patch,
+  +files/gdm-3.7.90-fix-daemonize-regression.patch, +gdm-3.8.0.ebuild:
+  Version bump for Gnome 3.8
 
   14 Mar 2013; Alexandre Rostovtsev <tetromino@gentoo.org> gdm-3.6.2.ebuild:
   Remove unnecessary dependency on consolekit[pam] and pam[consolekit], thanks
diff --git a/gnome-base/gdm/Manifest b/gnome-base/gdm/Manifest
index 80cb2503d544..907b45c707ee 100644
--- a/gnome-base/gdm/Manifest
+++ b/gnome-base/gdm/Manifest
@@ -26,23 +26,23 @@ AUX gdm-3.3.92.1-disable-accessibility.patch 779 SHA256 a32bddeb5e57086df41b9db4
 AUX gdm-3.6.0-fix-daemonize-regression.patch 6639 SHA256 6ff6eeba681dc73ae77058ba6ad1ecb292af843189a83071b96b1d84fbe887e9 SHA512 5de1e38b447e1dce933b004951366c701707a35c990fa35c84959753b32326e93be7fde073abc51e5bf439b5fd4277adce5f3ab190a7aac3d65211d84411f06a WHIRLPOOL f6a5db38a750d47375f69088765dd9e653dc4a70750a542e660ce7c876cc30f61e05e332250e5daf0f9d50c512791eac18cc69585c42aa5decb206b2ee7b361d
 AUX gdm-3.6.0-selinux-automagic.patch 909 SHA256 9b1a3c5913e53f30641dc1177d396060c81abcfff6d8e9acc738e4d19e396580 SHA512 68a6fa710862bde6479b9e35f66d5b65c5cf90df462d8f318ad06ad04fd2106376915250d8b09a6ca0716fab78aedc619e41de6f2c93e57449442a7613fe575b WHIRLPOOL a5ca1901f52be902cb6896759a3ce92f2298782d80ca6c6a023a3fd7a6cea8884f93af7cbc85788fd24166f4bf5da1c357b2056d3d6141fb5540273b9dd63a5a
 AUX gdm-3.6.2-gdm-slave.xml-unicode.patch 792 SHA256 4e53f08356b9fbc0669bfe15df848d92b845244604a329ed4cfe753c94691990 SHA512 4f856ffeb3e9b720be24fdb2f231a3245b4fea2a503cfc74b5ebbf77418ae6c6cf377568f53da053efe42304e0bad9add2dc5d7a0571ed3152fb0ad0c16a9019 WHIRLPOOL 59fbab49f7420236a2a3a34f5b700b2b6306235d6f60b383886cdbd01f05153dc2c06a102c0baad8ed350ffdcaad7a1ba448abb2ac6d77a7e759c541f63f3b14
+AUX gdm-3.7.3.1-disable-accessibility.patch 831 SHA256 445a36bcc14340dc95b1328528dac135900c1b204121744a439279449439a4bb SHA512 e9981fc1aabb383897c8dc3a08b337c135a0f351862cd5a0e295d73c1dacccafafbae96825285bd1625652d0d91db6db5ef57cb537a473e239c13865536e0b0f WHIRLPOOL ca55f530be9365cdfdeb1ac0de4e0345cacbb8fd7d823b1410cec14835000093b83eb5a68c603abed9b3e281e27f4b05291b15d09125bfc358b57a4c6b47b3ce
+AUX gdm-3.7.90-fix-daemonize-regression.patch 4686 SHA256 60299beb4ad8e10d767e3d8cd54a0a07c78477a5714e6ec1029d20be91d240ce SHA512 03916fe97ce82e123c20675039d65d1f3f944055eb79140bb0c13785378be74913d9e022819d0d5895144b3618ffb3e9994d000ea2a8b9bb6d487907c28e70d6 WHIRLPOOL 45f442aa0ea8fdcf7ed9d608d34e45fb7965452d65053b85e99363ab5fd239c7c0c95b3cecc4790d4342f4176571d1a51b6c109d42fcebbb6c51075c28f14adf
 DIST gdm-2.20.11.tar.bz2 4013059 SHA256 2e21c9a44941cd0033aaa6b381b563488bbdd0ad1a28ef05f7e0178891f1eaa2 SHA512 ca8ce81161c640ef2753a35b8eb0fd8669a7e42dc6272b2aa7b4a9f525b4d03dc46bb5aa8d41b69aaba36c8715a220c92e75c169ce9d5af39b25853505abeb39 WHIRLPOOL 0bdb90aef849c7b505ffb1b0af1b904970a9cd11c27cf631794b14a01b5e0fb01666a51b68cf288ae79057dd7bfca9a8f1ef9518ec5b04a4867eb7792c631765
 DIST gdm-2.20.9-gentoo-files-r1.tar.bz2 3494 SHA256 666c0bf1ba28ccc257bf1235b5286e1eb9e15230c0036413ab428e09c54238f9 SHA512 aaf0f4bfdb13f6dc81dbfe93b144343b6a8146698450fce9753396c92bef2c4e699f3f5c2ff9b88736432d2fcb861ab8dc423148109cb9194983e0c07baa8aa5 WHIRLPOOL 698cd66740872260a106f8174a51a44a45817112d696b2741fd537a10362308ffa8917df31190fe042c46b7ea76e2f8d1147f5c15e39cfb33f1f2f7e951ffb78
 DIST gdm-3.6.2.tar.xz 1627356 SHA256 fbf41bd68299eccdcf456c0869771999f75d3d9bf0f57ce1038db08b54e8cbb9 SHA512 0761cda9d26b6e665989e708be0f3dfa2fa85b997f4c5cfeb151b45e19114e6e1fcbd2c67a547e6698d83f3978e37203db3dcf2e5670356f6f93986ffc55d37e WHIRLPOOL 0396435f90b504605fe0555264de1202efea57f2a48a94035a4113828fe66ff117a4dde3eaa648591b26f902b84e9a8bfab117f29cc4a7ea31b45a0b8c965904
+DIST gdm-3.8.0.tar.xz 1665812 SHA256 4a0894ae50d1f090c6ccc450b74142243fff9ee17e2924c0f363ea51b3ba6bd5 SHA512 6de9a09777a66e1d0879bf43179aa40eaa8389123ff959fdcc34dfa71a3d75738ee0e90a47712934d1c4bfcc7e32f70a634640d53000907dfdf50f4b3118c7b5 WHIRLPOOL 8daa065867202a4de93dd553605698775da67c17944a0a8d4d932e1e867b733fc372aecd5c1e54c8690363fea6f858e47f54af7b70c13681a1931e2c694aa42e
 DIST gdm-gentoo-2012.09.25.tar.xz 1448 SHA256 f5978e4309e5486be41fec437a6e538dbfca3451757f3282a557941c4e70700d SHA512 c9d1a4699c34ce8708a4e7eed1b38d66ead507a4a2a6b45f2ef6254d54b46c755c9195db0593d6aa6785a8986e2ef5235592071c0cae8c1c8963951ecdb7c079 WHIRLPOOL c0efd131977b0036431b9edd6932025247323f198dc1bd7195efb55d31fd6b106ebdf391944b0009cf7a3261e99160fa6041a26348fe020badf26d0785f5dcc8
 DIST gentoo-gdm-theme-r3.tar.bz2 411703 SHA256 c7cbe97757ff93f0ffd42f9d9fb702278a361e830940a03901cda9943f44ba68 SHA512 47485899c698a2f6c3dee540806c0bbdedeab77a31b1f2b191f7f98d0d88a580aeb8dddf16fc33226db0519c21d185112421b5c6e233883ea4f67c844028281a WHIRLPOOL bac9f9ef3e7e88401e605c34deca6e7c31e2d4456af3781252a91f7bc33084af27ecc9e4a74022767b25db23d8f70842a39225c8544f1c02229ad7f7af670d42
 EBUILD gdm-2.20.11-r1.ebuild 7213 SHA256 71ac1e2eaaac38e36b3a11fc9bd883399e57b0bcae84458804f15611b5bf05b0 SHA512 5b78fe76b6ce79f5cab0ff027c1bc117766c234acfa58869155e56cd4fe0aae5a2e971014f2d9ea15637dbc6fcc5d5e536b5f36a6e3e664b2b2cb68779d83b04 WHIRLPOOL 7837696f0f0e54045ae4df101b89aa8ac9147ce064a406ed604ef8c7c04b30953ba35a8773c6bc404a60d62f6bca124db486c498690a561d2e8112b5f4452b5d
 EBUILD gdm-3.6.2.ebuild 7973 SHA256 8fa3f619faab76d72ae427ad3917c93b1be4bfdc4202e02d78783c3f6f3f6de5 SHA512 a263f88ac1efe04ab6b2540991edd5e65df4584835e1a51571601c5a5064c9ac2df13716d4246d61c4f4f0c08ec138b82237c63afdd587de6e1c4146bf9c1f1a WHIRLPOOL fbdcd38e941122aff7b056450e53ef4a04fd9d2d8af8a28c6bf9ff3e45f4ea32b8a338418fa26cb0e104bfb436575ee45fcc4471ff92b776233b578eecc3a154
-MISC ChangeLog 55451 SHA256 a2e11e11cc65c6acd0eb6d3832538c647d73ed33c54962e4f1cb3c57f1dd1b9b SHA512 5eb5df41f12bc100c00068c70a38eb8baa2c4ff784ce694f3a961179f8c39c47afde75c06c2077390c4dd9fecf8779165de56472ca043f573685fe64d9b60cd2 WHIRLPOOL 22008262f97ae551c94013a90622e646f1c05ce25786c1276189ffe33b6c4d5c6c2fce2afa01f1066b79d84c5e3d368c2e1e4ecc86988dee2e5d1e9f7fb08657
+EBUILD gdm-3.8.0.ebuild 7828 SHA256 bdd602db93c5c052ad67b8742e8d986b495b40144629f839cac49f4c1790d575 SHA512 f5c25baa7d608dde8a91cca000405b18b7c2d96740df42962a33070edd6e3682a5560a22ac4f61a4dbf4b93e7cf0504172432300b203bee0bf2678a379748132 WHIRLPOOL 09e3ad047629a7fdafde41669303326b4d6e1eb8b3d81b2b8d3d77b8e6fea67e924538c3660e0a28e8dad2e5084572a7415a62bfe2baea94d5ceeb49f2a1704c
+MISC ChangeLog 55670 SHA256 a4a9d3e4fc4a5b1850a9c85d0c2eb8ec276b14805311952fb52fd2d13a6ae552 SHA512 b082af1def65ca3e61f0eb32b2dfac5cf73482aa7fbb5b8e440895da3373e918203c7af78ed7c0e5dbb3243b212aaea1fa5206339029c95d212a36dbea6b8564 WHIRLPOOL 66fd4bc8d563c7d075e5d82885d8f4863e6be3e256aa8709ada32f7327807f27097dcdf0041d93a5b5b157db979986df6f0262334595ed24b915eedc8e6e2b1f
 MISC metadata.xml 1022 SHA256 37e58ae7dcad61901d81d13c5594664f8d4c6b6ff44171884e6ac65b3561625b SHA512 91b08a96b496de46786985dfc069d51886d6507a15c25b2731f8272bc8bc170644744b88216f9eb2943274a752ff4c6bb6577c543cded31d745d92cc7781e286 WHIRLPOOL 863c72a48f63279bcd4762e652c2c25b17b4d07fda26c3a43828240206d10bfb5e68461523572c081fdbcc9e097930c873d7e5604fd2d8d77e4cc6edec08885a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRQVLlAAoJEJ0WA1zPCt1hCLoIAKbXBVx+qaZ9UApJG9/vgVS2
-RX7OOK6fWOYGpXARPcVyIJ3axNWiLdTfzxS/zEzf2N46FM+rSclgYZbBZjIULuLK
-Is3edYqz94jbzHQZ+3yNcN9i7oDhUun+T9PNsvRPZdBWMmZUIPpK0BMEHdMqxyh3
-aSo/6LZHBm0zVBXLwRtfAL7SH/FOIgoWFALPAfXFkt32t4kUlG81o+C3azkhMrm5
-/LDH8aWtAv/bZylFjVY6cHXvhDA93YIH6iRAlz7Ycwiy7610nAX3jZnmEKpcVoAT
-RN0SXqknOFSBHlgQVQULQHQjQ0C5SLIFA/iVkp+ohR65D6sGJPV2cqU2/7k5gPo=
-=pRjm
+iEYEAREIAAYFAlFUyIgACgkQCaWpQKGI+9SyiwCfUGjvZgF3k7/FD2DNSXw3dlCg
+y7IAn0dkBQMB5ZemEvjMOjWlaTx11MQ8
+=2Ga/
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gdm/files/gdm-3.7.3.1-disable-accessibility.patch b/gnome-base/gdm/files/gdm-3.7.3.1-disable-accessibility.patch
new file mode 100755
index 000000000000..bf684640a16d
--- /dev/null
+++ b/gnome-base/gdm/files/gdm-3.7.3.1-disable-accessibility.patch
@@ -0,0 +1,34 @@
+From 07fb1b31d818f308beb1c3800c4b90830b57d01b Mon Sep 17 00:00:00 2001
+From: Sobhan Mohammadpour <sobhanmohammadpour1@yahoo.fr>
+Date: Fri, 25 Jan 2013 10:03:31 +0330
+Subject: [PATCH] don't load accessbility
+
+---
+ data/00-upstream-settings | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/data/00-upstream-settings b/data/00-upstream-settings
+index 660a295..3993786 100644
+--- a/data/00-upstream-settings
++++ b/data/00-upstream-settings
+@@ -7,7 +7,7 @@
+ #
+ 
+ [org/gnome/desktop/a11y/keyboard]
+-enable=true
++enable=false
+ 
+ [org/gnome/desktop/background]
+ show-desktop-icons=false
+@@ -16,7 +16,7 @@ show-desktop-icons=false
+ exec='/bin/true'
+ 
+ [org/gnome/desktop/interface]
+-toolkit-accessibility=true
++toolkit-accessibility=false
+ 
+ [org/gnome/desktop/lockdown]
+ disable-application-handlers=true
+-- 
+1.8.1
+
diff --git a/gnome-base/gdm/files/gdm-3.7.90-fix-daemonize-regression.patch b/gnome-base/gdm/files/gdm-3.7.90-fix-daemonize-regression.patch
new file mode 100755
index 000000000000..810bd6e83646
--- /dev/null
+++ b/gnome-base/gdm/files/gdm-3.7.90-fix-daemonize-regression.patch
@@ -0,0 +1,134 @@
+From bda248c1e184f92aedf9f8d932ebd20746910d52 Mon Sep 17 00:00:00 2001
+From: Sobhan Mohammadpour <sobhanmohammadpour1@yahoo.fr>
+Date: Mon, 4 Mar 2013 21:23:45 +0330
+Subject: [PATCH] gdm-3.7.90 fix daemonize regression
+
+---
+ configure.ac       |  4 ++++
+ daemon/Makefile.am |  1 +
+ daemon/main.c      | 45 +++++++++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 50 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index 0918060..d4ea271 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -99,6 +99,10 @@ PKG_CHECK_MODULES(DAEMON,
+ AC_SUBST(DAEMON_CFLAGS)
+ AC_SUBST(DAEMON_LIBS)
+ 
++PKG_CHECK_MODULES(LIBDAEMON, libdaemon)
++AC_SUBST(LIBDAEMON_CFLAGS)
++AC_SUBST(LIBDAEMON_LIBS)
++
+ GLIB_GSETTINGS
+ 
+ PKG_CHECK_MODULES(NSS,
+diff --git a/daemon/Makefile.am b/daemon/Makefile.am
+index ead9096..b810089 100644
+--- a/daemon/Makefile.am
++++ b/daemon/Makefile.am
+@@ -385,6 +385,7 @@ gdm_LDADD = \
+ 	$(top_builddir)/common/libgdmcommon.la	\
+ 	$(XLIB_LIBS)				\
+ 	$(DAEMON_LIBS)				\
++	$(LIBDAEMON_LIBS)			\
+ 	$(XDMCP_LIBS)                           \
+ 	$(LIBWRAP_LIBS)                         \
+ 	$(SYSTEMD_LIBS)				\
+diff --git a/daemon/main.c b/daemon/main.c
+index 8176fe3..0151862 100644
+--- a/daemon/main.c
++++ b/daemon/main.c
+@@ -34,6 +34,8 @@
+ #include <locale.h>
+ #include <signal.h>
+ 
++#include <libdaemon/dfork.h>
++
+ #include <glib.h>
+ #include <glib/gi18n.h>
+ #include <glib/gstdio.h>
+@@ -329,8 +331,10 @@ main (int    argc,
+         static gboolean     do_timed_exit    = FALSE;
+         static gboolean     print_version    = FALSE;
+         static gboolean     fatal_warnings   = FALSE;
++        static gboolean     no_daemon        = FALSE;
+         static GOptionEntry entries []   = {
+                 { "fatal-warnings", 0, 0, G_OPTION_ARG_NONE, &fatal_warnings, N_("Make all warnings fatal"), NULL },
++                { "nodaemon", 0, 0, G_OPTION_ARG_NONE, &no_daemon, N_("Do not fork into the background"), NULL },
+                 { "timed-exit", 0, 0, G_OPTION_ARG_NONE, &do_timed_exit, N_("Exit after a time (for debugging)"), NULL },
+                 { "version", 0, 0, G_OPTION_ARG_NONE, &print_version, N_("Print GDM version"), NULL },
+ 
+@@ -343,6 +347,15 @@ main (int    argc,
+ 
+         ret = 1;
+ 
++        /* preprocess the arguments to support the xdm style
++         * -nodaemon option
++         */
++        int i;
++        for ( i = 0; i < argc; i++) {
++                if (strcmp (argv[i], "-nodaemon") == 0)
++                        argv[i] = "--nodaemon";
++        }
++
+         context = g_option_context_new (_("GNOME Display Manager"));
+         g_option_context_add_main_entries (context, entries, NULL);
+         g_option_context_set_ignore_unknown_options (context, TRUE);
+@@ -369,6 +382,33 @@ main (int    argc,
+                 g_log_set_always_fatal (fatal_mask);
+         }
+ 
++        if (!no_daemon) {
++                pid_t pid;
++                if (daemon_retval_init () < 0) {
++                        g_warning ("Failed to create pipe");
++                        exit (-1);
++                }
++                if ((pid = daemon_fork ()) < 0) {
++                        /* Fork failed */
++                        daemon_retval_done ();
++                        exit (1);
++                } else if (pid) {
++                        /* Parent process: wait 20s for daemon_retval_send() in the daemon process */
++                        if ((ret = daemon_retval_wait (20)) < 0) {
++                            g_warning ("Timed out waiting for daemon process: %s", strerror(errno));
++                            exit (255);
++                        } else if (ret > 0) {
++                            g_warning ("Daemon process returned error code %d", ret);
++                            exit (ret);
++                        }
++                        exit (0);
++                }
++                /* Daemon process */
++                daemon_close_all (-1);
++                /* Start a new process group so that killing the daemon will kill the processes that it spawned */
++                setsid ();
++        }
++
+         gdm_log_init ();
+ 
+         settings = gdm_settings_new ();
+@@ -418,6 +458,9 @@ main (int    argc,
+                 g_timeout_add_seconds (30, (GSourceFunc) timed_exit_cb, main_loop);
+         }
+ 
++        if (!no_daemon)
++                daemon_retval_send (0);
++
+         g_main_loop_run (main_loop);
+ 
+         g_debug ("GDM finished, cleaning up...");
+@@ -433,6 +476,8 @@ main (int    argc,
+         ret = 0;
+ 
+  out:
++        if (!no_daemon)
++                daemon_retval_send (ret);
+         if (error) {
+                 g_printerr ("%s\n", error->message);
+                 g_clear_error (&error);
+-- 
+1.8.1.2
+
diff --git a/gnome-base/gdm/gdm-3.8.0.ebuild b/gnome-base/gdm/gdm-3.8.0.ebuild
new file mode 100644
index 000000000000..a6e9ab0ef4bc
--- /dev/null
+++ b/gnome-base/gdm/gdm-3.8.0.ebuild
@@ -0,0 +1,258 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-3.8.0.ebuild,v 1.1 2013/03/28 22:47:35 pacho Exp $
+
+EAPI="5"
+GNOME2_LA_PUNT="yes"
+
+inherit autotools eutils gnome2 pam systemd user
+
+G_PV="2012.09.25"
+G_P="gdm-gentoo-${G_PV}"
+DESCRIPTION="GNOME Display Manager"
+HOMEPAGE="https://live.gnome.org/GDM"
+SRC_URI="${SRC_URI}
+	http://dev.gentoo.org/~tetromino/distfiles/${PN}/${G_P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="accessibility audit +consolekit +fallback fprint +gnome-shell +introspection ipv6 ldap plymouth selinux smartcard systemd tcpd test xinerama"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+
+# NOTE: x11-base/xorg-server dep is for X_SERVER_PATH etc, bug #295686
+# nspr used by smartcard extension
+# dconf, dbus and g-s-d are needed at install time for dconf update
+# libdaemon needed for our fix-daemonize-regression.patch
+COMMON_DEPEND="
+	app-text/iso-codes
+	>=dev-libs/glib-2.35:2
+	>=x11-libs/gtk+-2.91.1:3
+	dev-libs/libdaemon
+	>=x11-libs/pango-1.3
+	dev-libs/nspr
+	>=dev-libs/nss-3.11.1
+	>=gnome-base/dconf-0.11.6
+	>=gnome-base/gnome-settings-daemon-3.1.4
+	gnome-base/gsettings-desktop-schemas
+	>=media-libs/fontconfig-2.5.0
+	>=media-libs/libcanberra-0.4[gtk3]
+	sys-apps/dbus
+	>=sys-apps/accountsservice-0.6.12
+	>=sys-power/upower-0.9
+
+	x11-apps/sessreg
+	x11-base/xorg-server
+	x11-libs/libXi
+	x11-libs/libXau
+	x11-libs/libX11
+	x11-libs/libXdmcp
+	x11-libs/libXext
+	x11-libs/libXft
+	x11-libs/libXrandr
+	>=x11-misc/xdg-utils-1.0.2-r3
+
+	virtual/pam
+	sys-auth/pambase[consolekit?,systemd?]
+
+	accessibility? ( x11-libs/libXevie )
+	audit? ( sys-process/audit )
+	consolekit? ( >=sys-auth/consolekit-0.4.5_p20120320-r2[pam] )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.12 )
+	plymouth? ( sys-boot/plymouth )
+	selinux? ( sys-libs/libselinux )
+	systemd? ( >=sys-apps/systemd-186[pam] )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+	xinerama? ( x11-libs/libXinerama )
+"
+# XXX: These deps are from session and desktop files in data/ directory
+# at-spi:1 is needed for at-spi-registryd (spawned by simple-chooser)
+# fprintd is used via dbus by gdm-fingerprint-extension
+# gnome-session-3.6 needed to avoid freezing with orca
+RDEPEND="${COMMON_DEPEND}
+	>=gnome-base/gnome-session-3.6
+	x11-apps/xhost
+	x11-themes/gnome-icon-theme-symbolic
+
+	accessibility? (
+		app-accessibility/gnome-mag
+		app-accessibility/gok
+		app-accessibility/orca
+		gnome-extra/at-spi:1 )
+	consolekit? ( gnome-extra/polkit-gnome )
+	fallback? ( x11-wm/metacity )
+	fprint? (
+		sys-auth/fprintd
+		sys-auth/pam_fprint )
+	gnome-shell? ( >=gnome-base/gnome-shell-3.1.90 )
+	!gnome-shell? ( x11-wm/metacity )
+	smartcard? (
+		app-crypt/coolkey
+		sys-auth/pam_pkcs11 )
+
+	!gnome-extra/fast-user-switch-applet
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	>=dev-util/intltool-0.40.0
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+	x11-proto/inputproto
+	x11-proto/randrproto
+	test? ( >=dev-libs/check-0.9.4 )
+	xinerama? ( x11-proto/xineramaproto )
+"
+
+pkg_setup() {
+	enewgroup gdm
+	enewgroup video # Just in case it hasn't been created yet
+	enewuser gdm -1 -1 /var/lib/gdm gdm,video
+
+	# For compatibility with certain versions of nvidia-drivers, etc., need to
+	# ensure that gdm user is in the video group
+	if ! egetent group video | grep -q gdm; then
+		# FIXME XXX: is this at all portable, ldap-safe, etc.?
+		# XXX: egetent does not have a 1-argument form, so we can't use it to
+		# get the list of gdm's groups
+		local g=$(groups gdm)
+		elog "Adding user gdm to video group"
+		usermod -G video,${g// /,} gdm || die "Adding user gdm to video group failed"
+	fi
+}
+
+src_prepare() {
+	# GDM grabs VT2 instead of VT7, bug 261339, bug 284053, bug 288852
+	# XXX: We can now pass a hard-coded initial value; temporary
+	# FIXME
+#	epatch "${FILESDIR}/${PN}-2.32.0-fix-vt-problems.patch"
+
+	# daemonize so that the boot process can continue, bug #236701
+	epatch "${FILESDIR}/${PN}-3.7.90-fix-daemonize-regression.patch"
+
+	# make custom session work, bug #216984
+	epatch "${FILESDIR}/${PN}-3.2.1.1-custom-session.patch"
+
+	# ssh-agent handling must be done at xinitrc.d, bug #220603
+	epatch "${FILESDIR}/${PN}-2.32.0-xinitrc-ssh-agent.patch"
+
+	# automagic selinux :/
+	epatch "${FILESDIR}/${PN}-3.6.0-selinux-automagic.patch"
+
+	# make gdm-fallback session the default if USE=-gnome-shell
+	if ! use gnome-shell; then
+		sed -e "s:'gdm-shell':'gdm-fallback':" \
+			-i data/00-upstream-settings || die "sed failed"
+	fi
+
+	# don't load accessibility support at runtime when USE=-accessibility
+	use accessibility || epatch "${FILESDIR}/${PN}-3.7.3.1-disable-accessibility.patch"
+
+	mkdir -p "${S}"/m4
+	eautoreconf
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# PAM is the only auth scheme supported
+	# even though configure lists shadow and crypt
+	# they don't have any corresponding code.
+	# --with-at-spi-registryd-directory= needs to be passed explicitly because
+	# of https://bugzilla.gnome.org/show_bug.cgi?id=607643#c4
+	G2CONF="${G2CONF}
+		--disable-static
+		--localstatedir=${EPREFIX}/var
+		--with-xdmcp=yes
+		--enable-authentication-scheme=pam
+		--with-pam-prefix=${EPREFIX}/etc
+		--with-default-pam-config=none
+		--with-at-spi-registryd-directory=${EPREFIX}/usr/libexec
+		--with-consolekit-directory=${EPREFIX}/usr/lib/ConsoleKit
+		--with-initial-vt=7
+		$(use_with accessibility xevie)
+		$(use_with audit libaudit)
+		$(use_enable ipv6)
+		$(use_with consolekit console-kit)
+		$(use_with plymouth)
+		$(use_with selinux)
+		$(use_with systemd)
+		$(systemd_with_unitdir)
+		$(use_with tcpd tcp-wrappers)
+		$(use_with xinerama)
+		ITSTOOL=$(type -P true)"
+	gnome2_src_configure
+}
+
+src_install() {
+	gnome2_src_install
+
+	# our x11's scripts point to /usr/bin/gdm
+	dosym /usr/sbin/gdm /usr/bin/gdm
+
+	# log, etc.
+	keepdir /var/log/gdm
+
+	# gdm user's home directory
+	keepdir /var/lib/gdm
+	fowners gdm:gdm /var/lib/gdm
+
+	# install XDG_DATA_DIRS gdm changes
+	echo 'XDG_DATA_DIRS="/usr/share/gdm"' > 99xdg-gdm
+	doenvd 99xdg-gdm
+
+	cd "${WORKDIR}/${G_P}"
+	local LDAP
+	use ldap && LDAP=yes
+	emake GDM_WELCOME="gdm-launch-environment" LDAP=${LDAP} EPREFIX="${EPREFIX}" \
+		SYSTEMD_UNITDIR="$(systemd_get_unitdir)" DESTDIR="${D}" install
+}
+
+pkg_postinst() {
+	local d ret
+
+	gnome2_pkg_postinst
+
+	dbus-launch dconf update || die "'dconf update' failed"
+
+	# bug #436456; gdm crashes if /var/lib/gdm subdirs are not owned by gdm:gdm
+	ret=0
+	ebegin "Fixing ${EROOT}var/lib/gdm ownership"
+	chown gdm:gdm "${EROOT}var/lib/gdm" || ret=1
+	for d in "${EROOT}var/lib/gdm/"{.cache,.config,.local}; do
+		[[ ! -e "${d}" ]] || chown -R gdm:gdm "${d}" || ret=1
+	done
+	eend ${ret}
+
+	elog "To make GDM start at boot, edit /etc/conf.d/xdm"
+	elog "and then execute 'rc-update add xdm default'."
+	elog "If you already have GDM running, you will need to restart it."
+
+	elog
+	elog "GDM ignores most non-localization environment variables. If you"
+	elog "need GDM to launch gnome-session with a particular environment,"
+	elog "you need to use pam_env.so in /etc/pam.d/gdm-welcome; see"
+	elog "the pam_env man page for more information."
+	elog
+
+	if has_version sys-auth/pambase[gnome-keyring]; then
+		elog "For passwordless login to unlock your keyring, you need to set an"
+		elog "empty password on your keyring. Use app-crypt/seahorse for that."
+	else
+		elog "To unlock your keyring on login, install sys-auth/pambase"
+		elog "with USE=gnome-keyring"
+	fi
+
+	if [[ -f "/etc/X11/gdm/gdm.conf" ]]; then
+		elog "You had /etc/X11/gdm/gdm.conf which is the old configuration"
+		elog "file.  It has been moved to /etc/X11/gdm/gdm-pre-gnome-2.16"
+		mv /etc/X11/gdm/gdm.conf /etc/X11/gdm/gdm-pre-gnome-2.16
+	fi
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+
+	if rc-config list default | grep -q xdm; then
+		elog "To remove GDM from startup please execute"
+		elog "'rc-update del xdm default'"
+	fi
+}
diff --git a/gnome-base/gnome-shell/ChangeLog b/gnome-base/gnome-shell/ChangeLog
index a149cde37f0d..9eb47abe97c9 100644
--- a/gnome-base/gnome-shell/ChangeLog
+++ b/gnome-base/gnome-shell/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnome-base/gnome-shell
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-shell/ChangeLog,v 1.27 2013/02/20 23:26:01 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-shell/ChangeLog,v 1.28 2013/03/28 22:43:26 pacho Exp $
+
+*gnome-shell-3.8.0.1 (28 Mar 2013)
+
+  28 Mar 2013; Pacho Ramos <pacho@gentoo.org>
+  +files/gnome-shell-3.7.90-bluetooth-flag.patch,
+  +files/gnome-shell-3.8.0-networkmanager-flag.patch,
+  +files/gnome-shell-3.8.0-suspend.patch, +gnome-shell-3.8.0.1.ebuild:
+  Version bump for Gnome 3.8
 
 *gnome-shell-3.6.3.1 (20 Feb 2013)
 
diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest
index 46140884fa3e..02b5ca5f92db 100644
--- a/gnome-base/gnome-shell/Manifest
+++ b/gnome-base/gnome-shell/Manifest
@@ -5,18 +5,23 @@ AUX gnome-shell-3.2.1-automagic-gnome-bluetooth.patch 1841 SHA256 df5f86858b8abc
 AUX gnome-shell-3.4.0-optional-networkmanager.patch 8532 SHA256 487bfd9772799cdd1969b252056af4934870de4704a0bea581876b966e9c754c SHA512 20c2bc1ec1dc93a00f7ce7862a90965da7ce055e37f1e54514bd8af9779f797075255f7a2e61e78f24aeca197cadc8ddf4ced1a58be51f36109654847928d5a7 WHIRLPOOL 59a98990664e3023171411b4250e2f774062a11064b647361318712275b3f50affc0321d8f9316623814c46a349c8fa356e4bdbcc90f9b5b757bc89b77ac2bb2
 AUX gnome-shell-3.5.x-bluetooth-flag.patch 1845 SHA256 c910495fe1bf93c6ab09252df17f8d0fcd4b6fe75fed709c8c97a55bf401970e SHA512 37e4d252d62abfe264c639e47906afa5cd17d159101072ff4ed5ddb5dfc62b4563d80c4632d50bf20c1c62cbc1bdc2a6dc2b34f4e5cc9387095dc3f5606917d8 WHIRLPOOL 6db0c6907947fc86b932f7e391f465712fce5fcd731c6be11da61678c6452e93686c818491b914155a2793ff7ff73ded540de77059ecc498ddadf81a7382714f
 AUX gnome-shell-3.6.0-networkmanager-flag.patch 8352 SHA256 90f971920a04d9d1a828008ca3230c4e215a0d5370ffdf9ab6bf740829f5e85d SHA512 ea85a20a3416da2a0cdd9ea20b5f868ab69f3a1326142da89d259c5e0d67e3f7b4a722ff0a6be29ba2cb224f72a998edec89eda5ee905342c4c5cadfa3964ee4 WHIRLPOOL 2a75f3b9d897aa5d368f124832e476b3b971c6794256a32e150157cd7a8055d62ae1076a3d0ddac16796535e5b0598df22ea267b6d0c2c58f9c1a0d61ed3e35b
+AUX gnome-shell-3.7.90-bluetooth-flag.patch 1769 SHA256 2b9a3f5f5a339d14d003b270dd0002da678d6da977b010154a70540bcdb05d3f SHA512 6bcb9d3f8067b475f38a31f09b82bf46ae7e8d85847e05ab38e80a656653b67903211480a38e272dc27cc8f96932c7d5a9a167536d458a46f2a62583f71562d0 WHIRLPOOL ad23c1556c1efd1b0832c9114bfab47cb4f55674f0dd10c0cc8ef379934c130496b2dbe10cc5897b106965e075033e1256b205d9a723f71fd0c39f08e91792e1
+AUX gnome-shell-3.8.0-networkmanager-flag.patch 7395 SHA256 dd4365b5c576308d292c0226c9a6ac50508203060fefde7ff6859cbe3d8ba918 SHA512 c9e930f25d8996b9ec388061aec53ec6099526f7e980707099f077db4bf0317df497c331a776c88c64cfa5ecf12afc7b241f3227955ca4e3843e9d320395d398 WHIRLPOOL 49ae9e38e5119fc51da24ada10c7e8f947cd2edff9925dc1addc093a692403c99458acacd0b7cfe13cd3a988af160219332d276ab374e2b63673cc6ee071883b
+AUX gnome-shell-3.8.0-suspend.patch 2069 SHA256 5f313b9ece9e184b3559ee7b0df0c467adfab02749f499afc320c73b54b63a8a SHA512 5bc3cd0da743a78387423cc03902aa815429a540922b9caa5a749b99b966a135b46a7ccde5800987d1394db20d3234d360468b593ec02f4989175a12885cd513 WHIRLPOOL b91edd9ec9bd5f53c77193e6e344a654f6672a939196315a918d97d9e63903360ab067dbccf2b89c616c25215ef38c2472eca88df9235c99a97818d273a770f6
 DIST gnome-shell-3.4.2.tar.xz 1257612 SHA256 3807f7882968d032f8f5c64b0e0af51c0d016f2e1c4fd1576203c9350e412720 SHA512 6d05c3c068e1a58aee1c96be88d9bf2332ff02f2b53b47bd405c94fa2345de528fcdddfbcd662eb30e50c96c6b8c70550fd72cee01547036845e7319e403a638 WHIRLPOOL 31010bc265f365a2e26a31eb36427b99443eb4efefc4d825a13857837b3fb1264b1776f17270861f686b600fe6edd53fe8dd108150e3b814631268a2a340e892
 DIST gnome-shell-3.6.2.tar.xz 1396196 SHA256 86cff93ade1bf6a67ebd339c017d567c7dc849ff8b256a3803306f44c24b44f0 SHA512 5e03f12a2065bac698c232ae00ddcab2cccc5c88b1b6be586c4cb96a1c3fb10ab59258d4f8c47d2f299060ed485162c30a9dc1c511d4af51a4c49cda13f0fbca WHIRLPOOL 77ceb9a5f6e5ed6481eccf495f92dd3af7ce73550cc90f54bada055bac339f15edde02db58d59b2211ee7cd637f47484fe554f6845ad080e166d7d94ee92e5f7
 DIST gnome-shell-3.6.3.1.tar.xz 1408036 SHA256 4e0328d43ac443e7cc0c43bb67895112643952f14cd20fff1109c6cc5849d603 SHA512 62475d1c2da2d3716158ef896214ada3c03a0fb226cd76a550b542d5cd0ce97303316cecf6a1feea7729666de9f29c333a79a6f6822b29245a1d7535a6c4c6b8 WHIRLPOOL 21146084b74372fbee6ff6f1a4a4609c16601ea0a39331a684dcda57a74a965146ca9860e3a170160c720175111c0c0a0c49f3d3c960ee335a39775a4945704b
+DIST gnome-shell-3.8.0.1.tar.xz 1500260 SHA256 cf98c3d038704fd057489c696a6cb9e2ee2ae5a10db5b45ddeba59fb82d507b8 SHA512 072834174293d9090fd5a16806a4a564b01c19bb68a1954ca6efb01223b58f12f3f43b30a4c6c3bab6bf57e72250bd3cc5960398e3a15f20a38d7742f0c7ad99 WHIRLPOOL 6906cac7d63841fd74801bca73c833728756b02cd87d59a07d52558b12101c1b010bacb242cf770f89e6007f6906b09bf35a2a9ead96e3392a98c536f6fbeae7
 EBUILD gnome-shell-3.4.2.ebuild 7081 SHA256 2f12f1c54921216d41f40fb8a136f1b3575b81e706a4521576e3d003d4177778 SHA512 34266e5f77dd7d84f7089e5b62f82beefc1929246c66d457b549ab1a0c8c7f225e76d48d2270fe8390a5830cc0ea728b6c66bd2cd3e87f52f2f30054903fa739 WHIRLPOOL 142870bf412db7854c094fb3bf043abfb856555ebec56014a232285ee3366bd60628801111a4c42e6c5e9162a990a220c3c852c3963c9da117ea5ec80e086ca3
 EBUILD gnome-shell-3.6.2-r1.ebuild 6904 SHA256 32ed1799ef744fbb4aff2c89995c0579ea667d83902782cfc1fe68bbe82d8c31 SHA512 4a580165f6f7820dee5a8c6ecaa6550f8047217579225cc9f8f6d4093be02c672f2e9ae043bedc12a6b17c2e31a92651b8c7a5e94cd211fd4fd0ae29245c85af WHIRLPOOL ed40e56f61d3ee41a8a09e4bc79e2e0fd364268734a1fdb8499346a4282b586d3f44901c7619037047298f3713a4df60449b258faff64ccd53664e7ff439003d
 EBUILD gnome-shell-3.6.3.1.ebuild 6899 SHA256 792178784239e1011601529411be6fd288a435117cf8e190fc653ffd65a735a9 SHA512 c7a08f461f3c80b2c9d47b71d83eeb092aeeb7081b2e293e87e0bd0784857f9a7c2b10011197a71051475a2a16ea212cb1fef743da1c0bde31bb05d767233a46 WHIRLPOOL 15e7c843d5b88ed79a966a969b5f86399a0c79c37c45c29d5f72713c07b827213fdb8b545463054f3a4df059ea1db9965eb13e17f4bd33d17c7bb121c5fc4bc4
-MISC ChangeLog 7082 SHA256 a4c679fe203a503fb930182205c6b7fc4dd57f6d1daa9320350bab87460d742e SHA512 fc1be22668b7b36ba21b28357a64c0314ac41148a4d092b807ee62ee15e4c8df28017a2be806814a7edd2bd7f43aa47566191ec30818f55510c48a7ec4f801bc WHIRLPOOL 3f6de375c3bd11c89851ccafcaf9517af55412af7c077e97df30511522d7b0a06812922d2b9013943a3c2ecd4e34a1033301289b4f7e2b08ef576a536823b64f
+EBUILD gnome-shell-3.8.0.1.ebuild 6971 SHA256 6e2107fdb48a60817af364a74544a548f069d18f7c7c6e251d9c21d98c50513a SHA512 a3098849a9347f6d18b44c2eb2a04564c1576d22a0ab4f081eed44ecc81dcded101e324abacab0507582f6953a750755573893e292e659418f60c0d182d7362c WHIRLPOOL 77ba22970e312644ebf10f2934f5aa50aad6abeb276f08f1f08cb159fa0e7881aaae4ca1a42eba4377a782647ec426f8b91f00c49477f0d7de8ea010a0cc9696
+MISC ChangeLog 7371 SHA256 d91c2dec971554d57be5b95fa5cf9224fe858bebefb8a510349fb995676b06b0 SHA512 a9ef2726a0cc03b21179c4ea1fcf1426688f674179539afee064ef62632d281ac0e4e430e6649e4c71a18e2057b6fb0ba159497776b494ad00aa16146966c83f WHIRLPOOL f560205e2b6a102f3ce56a7f3468646213b63dc8788229fef496e7c74ea349e799a12204327580d4c47b94d1823cf51d43943a4c5e7c61887a42715ea7f7100c
 MISC metadata.xml 400 SHA256 23973e81d0dce0aa3c01a805dc6baa386c626c07015e8b0675b3402f7850b88f SHA512 5efbd89e333f41da839f6f18bdbbb236efd42642d57eb0317d448bbcd54fef36289125fc534d6bf1441eb852983c5dacda98712c4f1c6633b040305f1fc133f9 WHIRLPOOL a2e8a25716a103c6c123b4afd3393419ccc723c8f198cfa8dfa84666095ac231fac5253b4d5d0de9baff357f598edaa163605bb23673c7d72314585b7a5dceb3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlElW4oACgkQ1fmVwcYIWAaomwCgsCCU5sHIe3o3iAwKPJJl+HOn
-5PQAoMujvVLxMN9qOpOz7cYzmcBGf09P
-=Q3kS
+iEYEAREIAAYFAlFUx48ACgkQCaWpQKGI+9T3mgCfaY7dw7RNSxELyfaPjSOEO/xh
+rKwAn15R7cPqJbG2WJEqmSnpFZKqKjm6
+=nY5v
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.7.90-bluetooth-flag.patch b/gnome-base/gnome-shell/files/gnome-shell-3.7.90-bluetooth-flag.patch
new file mode 100755
index 000000000000..5e0fd1722be5
--- /dev/null
+++ b/gnome-base/gnome-shell/files/gnome-shell-3.7.90-bluetooth-flag.patch
@@ -0,0 +1,45 @@
+From 0556d99379265b5ccd256bc6befcd1486fe4e464 Mon Sep 17 00:00:00 2001
+From: Sobhan Mohammadpour <sobhanmohammadpour1@yahoo.fr>
+Date: Thu, 28 Feb 2013 18:48:32 +0330
+Subject: [PATCH] gnome-shell-3.7.90--bluetooth-flag
+
+https://bugs.gentoo.org/show_bug.cgi?id=398145
+
+Ed Catmur 2012-01-08 13:46:22 UTC
+libgnome-bluetooth-applet is a private library so they shouldn't be linking
+against it anyway.  I tried to work out how to tell libtool to add it to rpath
+but got totally lost.
+
+I'll see if I can work out how to fix the automagic gnome-bluetooth dependency
+so I can at least merge USE=-bluetooth.
+
+---
+ configure.ac | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index d9d1001..02f1e65 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -111,6 +111,8 @@ PKG_CHECK_MODULES(DESKTOP_SCHEMAS, gsettings-desktop-schemas >= 3.7.4)
+ PKG_CHECK_MODULES(CARIBOU, caribou-1.0 >= 0.4.8)
+ 
+ AC_MSG_CHECKING([for bluetooth support])
++AC_ARG_WITH([bluetooth], AS_HELP_STRING([--without-bluetooth], [Build without gnome-bluetooth library (default: auto)]))
++AS_IF([test "x$with_bluetooth" != "xno"], [
+ PKG_CHECK_EXISTS([gnome-bluetooth-1.0 >= 3.1.0],
+         [BLUETOOTH_DIR=`$PKG_CONFIG --variable=applet_libdir gnome-bluetooth-1.0`
+ 	 BLUETOOTH_LIBS=`$PKG_CONFIG --variable=applet_libs gnome-bluetooth-1.0`
+@@ -123,6 +125,9 @@ PKG_CHECK_EXISTS([gnome-bluetooth-1.0 >= 3.1.0],
+ 	[AC_DEFINE([HAVE_BLUETOOTH],[0])
+ 	 AC_SUBST([HAVE_BLUETOOTH],[0])
+ 	 AC_MSG_RESULT([no])])
++], [AC_DEFINE([HAVE_BLUETOOTH],[0])
++	 AC_SUBST([HAVE_BLUETOOTH],[0])
++	 AC_MSG_RESULT([no])])
+ 
+ PKG_CHECK_MODULES(CALENDAR_SERVER, libecal-1.2 >= $LIBECAL_MIN_VERSION libedataserver-1.2 >= $LIBEDATASERVER_MIN_VERSION gio-2.0)
+ AC_SUBST(CALENDAR_SERVER_CFLAGS)
+-- 
+1.8.1.2
+
diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.8.0-networkmanager-flag.patch b/gnome-base/gnome-shell/files/gnome-shell-3.8.0-networkmanager-flag.patch
new file mode 100755
index 000000000000..e9bff6160f84
--- /dev/null
+++ b/gnome-base/gnome-shell/files/gnome-shell-3.8.0-networkmanager-flag.patch
@@ -0,0 +1,206 @@
+From 9522d27dfa364b64a0fe5d87585b8a3309fbb92a Mon Sep 17 00:00:00 2001
+From: Sobhan Mohammadpour <sobhanmohammadpour1@yahoo.fr>
+Date: Tue, 12 Feb 2013 22:09:39 +0330
+Subject: [PATCH] gnome-shell-3.7.5-networkmanager-flag
+
+[ Alexandre Rostovtsev <tetromino@gentoo.org> :
+  * use config.js (and AC_SUBST HAVE_NETWORKMANAGER appropriately);
+  * take care to not import ui.status.network if nm is disabled;
+  * do not try to reassign to const variables;
+  * no point really in fiddling with the list of installed js files;
+  * don't build shell-mobile-providers if nm is disabled;
+  * use "networkmanager" instead of "network_manager" because THE
+    BIKESHED SHOULD BE BLUE, also because the upstream package name is
+    NetworkManager, not Network_Manager. 
+---
+ configure.ac         | 42 ++++++++++++++++++++++++++++++++++++++++++
+ js/Makefile.am       |  1 +
+ js/misc/config.js.in |  2 ++
+ js/ui/panel.js       | 12 +++++++-----
+ js/ui/sessionMode.js |  7 ++++++-
+ src/Makefile.am      | 15 ++++++++++++---
+ 6 files changed, 70 insertions(+), 9 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 1a2b947..683a3db 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -164,6 +164,36 @@ if test "$langinfo_ok" = "yes"; then
+             [Define if _NL_TIME_FIRST_WEEKDAY is available])
+ fi
+ 
++NM_MIN_VERSION=0.9.6
++AC_ARG_ENABLE(networkmanager,
++	      AS_HELP_STRING([--disable-networkmanager],
++			     [disable NetworkManager support  @<:@default=auto@:>@]),,
++              [enable_networkmanager=auto])
++
++if test "x$enable_networkmanager" != "xno"; then
++   PKG_CHECK_MODULES(NETWORKMANAGER,
++                     [libnm-glib libnm-util gnome-keyring-1],
++                     [have_networkmanager=yes],
++                     [have_networkmanager=no])
++
++   GNOME_SHELL_CFLAGS="$GNOME_SHELL_CFLAGS $NETWORKMANAGER_CFLAGS"
++   GNOME_SHELL_LIBS="$GNOME_SHELL_LIBS $NETWORKMANAGER_LIBS"
++else
++   have_networkmanager="no  (disabled)"
++fi
++
++if test "x$have_networkmanager" = "xyes"; then
++   AC_DEFINE(HAVE_NETWORKMANAGER, [1], [Define if we have NetworkManager])
++   AC_SUBST([HAVE_NETWORKMANAGER], [1])
++else
++   if test "x$enable_networkmanager" = "xyes"; then
++      AC_MSG_ERROR([Couldn't find NetworkManager.])
++   fi
++   AC_SUBST([HAVE_NETWORKMANAGER], [0])
++fi
++
++AM_CONDITIONAL(HAVE_NETWORKMANAGER, test "$have_networkmanager" = "yes")
++
+ # Sets GLIB_GENMARSHAL and GLIB_MKENUMS
+ AM_PATH_GLIB_2_0()
+ 
+@@ -209,3 +239,15 @@ AC_CONFIG_FILES([
+   man/Makefile
+ ])
+ AC_OUTPUT
++
++echo "
++Build configuration:
++
++	Prefix:                                 ${prefix}
++	Source code location:                   ${srcdir}
++	Compiler:                               ${CC}
++	Compiler Warnings:                      $enable_compile_warnings
++
++	Support for NetworkManager:             $have_networkmanager
++	Support for GStreamer recording:        $build_recorder
++"
+diff --git a/js/Makefile.am b/js/Makefile.am
+index 323cd1b..d17111a 100644
+--- a/js/Makefile.am
++++ b/js/Makefile.am
+@@ -8,6 +8,7 @@ misc/config.js: misc/config.js.in Makefile
+ 	sed -e "s|[@]PACKAGE_NAME@|$(PACKAGE_NAME)|g" \
+ 	    -e "s|[@]PACKAGE_VERSION@|$(PACKAGE_VERSION)|g" \
+ 	    -e "s|[@]HAVE_BLUETOOTH@|$(HAVE_BLUETOOTH)|g" \
++	    -e "s|[@]HAVE_NETWORKMANAGER@|$(HAVE_NETWORKMANAGER)|g" \
+ 	    -e "s|[@]GETTEXT_PACKAGE@|$(GETTEXT_PACKAGE)|g" \
+ 	    -e "s|[@]datadir@|$(datadir)|g" \
+ 	    -e "s|[@]libexecdir@|$(libexecdir)|g" \
+diff --git a/js/misc/config.js.in b/js/misc/config.js.in
+index 9769104..9c4795d 100644
+--- a/js/misc/config.js.in
++++ b/js/misc/config.js.in
+@@ -6,6 +6,8 @@ const PACKAGE_NAME = '@PACKAGE_NAME@';
+ const PACKAGE_VERSION = '@PACKAGE_VERSION@';
+ /* 1 if gnome-bluetooth is available, 0 otherwise */
+ const HAVE_BLUETOOTH = @HAVE_BLUETOOTH@;
++/* 1 if networkmanager is available, 0 otherwise */
++const HAVE_NETWORKMANAGER = @HAVE_NETWORKMANAGER@;
+ /* gettext package */
+ const GETTEXT_PACKAGE = '@GETTEXT_PACKAGE@';
+ /* locale dir */
+diff --git a/js/ui/panel.js b/js/ui/panel.js
+index cfeb351..3bb13b4 100644
+--- a/js/ui/panel.js
++++ b/js/ui/panel.js
+@@ -933,11 +933,13 @@ if (Config.HAVE_BLUETOOTH)
+     PANEL_ITEM_IMPLEMENTATIONS['bluetooth'] =
+         imports.ui.status.bluetooth.Indicator;
+ 
+-try {
+-    PANEL_ITEM_IMPLEMENTATIONS['network'] =
+-        imports.ui.status.network.NMApplet;
+-} catch(e) {
+-    log('NMApplet is not supported. It is possible that your NetworkManager version is too old');
++if (Config.HAVE_NETWORKMANAGER) {
++    try {
++        PANEL_ITEM_IMPLEMENTATIONS['network'] =
++            imports.ui.status.network.NMApplet;
++    } catch(e) {
++        log('NMApplet is not supported. It is possible that your NetworkManager version is too old');
++    }
+ }
+ 
+ const Panel = new Lang.Class({
+diff --git a/js/ui/sessionMode.js b/js/ui/sessionMode.js
+index f802dbd..eec830b 100644
+--- a/js/ui/sessionMode.js
++++ b/js/ui/sessionMode.js
+@@ -10,6 +10,8 @@ const FileUtils = imports.misc.fileUtils;
+ const Main = imports.ui.main;
+ const Params = imports.misc.params;
+ 
++const Config = imports.misc.config;
++
+ const DEFAULT_MODE = 'restrictive';
+ 
+ const _modes = {
+@@ -100,7 +102,10 @@ const _modes = {
+         isLocked: false,
+         isPrimary: true,
+         unlockDialog: imports.ui.unlockDialog.UnlockDialog,
+-        components: ['networkAgent', 'polkitAgent', 'telepathyClient',
++        components: Config.HAVE_NETWORKMANAGER ?
++                    ['networkAgent', 'polkitAgent', 'telepathyClient',
++                     'keyring', 'recorder', 'autorunManager', 'automountManager'] :
++                    ['polkitAgent', 'telepathyClient',
+                      'keyring', 'recorder', 'autorunManager', 'automountManager'],
+         panel: {
+             left: ['activities', 'appMenu'],
+
+--- a/src/Makefile.am.old	2013-03-27 10:35:51.763616888 +0100
++++ b/src/Makefile.am	2013-03-27 10:38:09.745425152 +0100
+@@ -116,7 +116,6 @@
+ 	shell-invert-lightness-effect.h	\
+ 	shell-keybinding-modes.h	\
+ 	shell-mount-operation.h		\
+-	shell-network-agent.h		\
+ 	shell-perf-log.h		\
+ 	shell-screenshot.h		\
+ 	shell-slicer.h			\
+@@ -129,6 +128,10 @@
+ 	shell-wm.h			\
+ 	shell-xfixes-cursor.h
+ 
++if HAVE_NETWORKMANAGER
++shell_public_headers_h +=  shell-network-agent.h
++endif
++
+ shell_private_sources = \
+ 	gactionmuxer.h			\
+ 	gactionmuxer.c			\
+@@ -159,7 +162,6 @@
+ 	shell-keyring-prompt.h		\
+ 	shell-keyring-prompt.c		\
+ 	shell-mount-operation.c		\
+-	shell-network-agent.c		\
+ 	shell-perf-log.c		\
+ 	shell-polkit-authentication-agent.h	\
+ 	shell-polkit-authentication-agent.c	\
+@@ -177,6 +179,10 @@
+ 	shell-xfixes-cursor.c		\
+ 	$(NULL)
+ 
++if HAVE_NETWORKMANAGER
++libgnome_shell_la_SOURCES +=  shell-network-agent.c
++endif
++
+ libgnome_shell_la_gir_sources = \
+ 	$(filter-out %-private.h $(shell_private_sources), $(shell_public_headers_h) $(libgnome_shell_la_SOURCES))
+ 
+@@ -287,7 +293,10 @@
+ libgnome_shell_la_CPPFLAGS = $(gnome_shell_cflags)
+ 
+ Shell-0.1.gir: libgnome-shell.la St-1.0.gir
+-Shell_0_1_gir_INCLUDES = Clutter-1.0 ClutterX11-1.0 Meta-3.0 TelepathyGLib-0.12 Soup-2.4 GMenu-3.0 NetworkManager-1.0 NMClient-1.0
++Shell_0_1_gir_INCLUDES = Clutter-1.0 ClutterX11-1.0 Meta-3.0 TelepathyGLib-0.12 Soup-2.4 GMenu-3.0
++if HAVE_NETWORKMANAGER
++Shell_0_1_gir_INCLUDES += NetworkManager-1.0 NMClient-1.0
++endif
+ Shell_0_1_gir_CFLAGS = $(libgnome_shell_la_CPPFLAGS) -I $(srcdir)
+ Shell_0_1_gir_LIBS = libgnome-shell.la
+ Shell_0_1_gir_FILES = $(libgnome_shell_la_gir_sources)
diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.8.0-suspend.patch b/gnome-base/gnome-shell/files/gnome-shell-3.8.0-suspend.patch
new file mode 100644
index 000000000000..9f7f5229fe75
--- /dev/null
+++ b/gnome-base/gnome-shell/files/gnome-shell-3.8.0-suspend.patch
@@ -0,0 +1,55 @@
+From b91d9c2867952520e685d689f75bc019befcaaf3 Mon Sep 17 00:00:00 2001
+From: Florian Müllner <fmuellner@gnome.org>
+Date: Sun, 03 Feb 2013 20:53:33 +0000
+Subject: loginManager: Make suspend() a NOP in the ConsoleKit path
+
+UPower will remove its suspend support eventually, and g-s-d already
+depends on logind for power management.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=693162
+
+Index: gnome-shell-3.7.90/js/misc/loginManager.js
+===================================================================
+--- gnome-shell-3.7.90.orig/js/misc/loginManager.js	2013-02-23 15:17:56.532244380 -0500
++++ gnome-shell-3.7.90/js/misc/loginManager.js	2013-02-23 15:19:29.800240480 -0500
+@@ -5,6 +5,7 @@
+ const Lang = imports.lang;
+ const Mainloop = imports.mainloop;
+ const Shell = imports.gi.Shell;
++const UPowerGlib = imports.gi.UPowerGlib;
+ const Signals = imports.signals;
+ 
+ const SystemdLoginManagerIface = <interface name='org.freedesktop.login1.Manager'>
+@@ -137,12 +138,10 @@
+     },
+ 
+     canSuspend: function(asyncCallback) {
+-        this._proxy.CanSuspendRemote(function(result, error) {
+-            if (error)
+-                asyncCallback(false);
+-            else
+-                asyncCallback(result[0] != 'no');
+-        });
++        Mainloop.idle_add(Lang.bind(this, function() {
++            asyncCallback(this._upClient.get_can_suspend());
++            return false;
++        }));
+     },
+ 
+     listSessions: function(asyncCallback) {
+@@ -199,6 +198,7 @@
+         this._proxy = new ConsoleKitManager(Gio.DBus.system,
+                                             'org.freedesktop.ConsoleKit',
+                                             '/org/freedesktop/ConsoleKit/Manager');
++        this._upClient = new UPowerGlib.Client();
+     },
+ 
+     // Having this function is a bit of a hack since the Systemd and ConsoleKit
+@@ -252,6 +252,7 @@
+     suspend: function() {
+         this.emit('prepare-for-sleep', true);
+         this.emit('prepare-for-sleep', false);
++        this._upClient.suspend_sync(null);
+     },
+ 
+     inhibit: function(reason, callback) {
diff --git a/gnome-base/gnome-shell/gnome-shell-3.8.0.1.ebuild b/gnome-base/gnome-shell/gnome-shell-3.8.0.1.ebuild
new file mode 100644
index 000000000000..c80ca296055d
--- /dev/null
+++ b/gnome-base/gnome-shell/gnome-shell-3.8.0.1.ebuild
@@ -0,0 +1,198 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.8.0.1.ebuild,v 1.1 2013/03/28 22:43:26 pacho Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_{6,7} )
+
+inherit autotools eutils gnome2 multilib pax-utils python-r1
+
+DESCRIPTION="Provides core UI functions for the GNOME 3 desktop"
+HOMEPAGE="http://live.gnome.org/GnomeShell"
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+IUSE="+bluetooth +i18n +networkmanager"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+# libXfixes-5.0 needed for pointer barriers
+# TODO: gstreamer support is currently automagical:
+# gstreamer? ( >=media-libs/gstreamer-0.11.92 )
+COMMON_DEPEND="
+	>=app-accessibility/at-spi2-atk-2.5.3
+	>=dev-libs/atk-2[introspection]
+	>=app-crypt/gcr-3.3.90[introspection]
+	>=dev-libs/glib-2.35:2
+	>=dev-libs/gjs-1.35.8
+	>=dev-libs/gobject-introspection-0.10.1
+	>=x11-libs/gtk+-3.7.9:3[introspection]
+	>=media-libs/clutter-1.13.4:1.0[introspection]
+	>=dev-libs/json-glib-0.13.2
+	>=dev-libs/libcroco-0.6.2:0.6
+	>=gnome-base/gnome-desktop-3.7.90:3=[introspection]
+	>=gnome-base/gsettings-desktop-schemas-3.7.4
+	>=gnome-base/gnome-keyring-3.3.90
+	>=gnome-base/gnome-menus-3.5.3:3[introspection]
+	gnome-base/libgnome-keyring
+	>=gnome-extra/evolution-data-server-3.5.3:=
+	>=media-libs/gstreamer-0.11.92:1.0
+	>=net-im/telepathy-logger-0.2.4[introspection]
+	>=net-libs/telepathy-glib-0.19[introspection]
+	>=sys-auth/polkit-0.100[introspection]
+	>=x11-libs/libXfixes-5.0
+	>=x11-wm/mutter-3.8.0[introspection]
+	>=x11-libs/startup-notification-0.11
+
+	${PYTHON_DEPS}
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+
+	dev-libs/dbus-glib
+	dev-libs/libxml2:2
+	gnome-base/librsvg
+	media-libs/libcanberra[gtk3]
+	media-libs/mesa
+	>=media-sound/pulseaudio-2
+	>=net-libs/libsoup-2.40:2.4[introspection]
+	x11-libs/libX11
+	x11-libs/gdk-pixbuf:2[introspection]
+	x11-libs/pango[introspection]
+	x11-apps/mesa-progs
+
+	bluetooth? ( >=net-wireless/gnome-bluetooth-3.5[introspection] )
+	networkmanager? ( >=net-misc/networkmanager-0.9.6[introspection] )
+"
+# Runtime-only deps are probably incomplete and approximate.
+# Introspection deps generated using:
+#  grep -roe "imports.gi.*" gnome-shell-* | cut -f2 -d: | sort | uniq
+# Each block:
+# 1. Pull in polkit-0.101 for pretty authorization dialogs
+# 2. Introspection stuff needed via imports.gi.*
+# 3. gnome-session is needed for gnome-session-quit
+# 4. Control shell settings
+# 5. xdg-utils needed for xdg-open, used by extension tool
+# 6. gnome-icon-theme-symbolic and dejavu font neeed for various icons & arrows
+# 7. IBus is needed for i18n integration
+# 8. mobile-broadband-provider-info, timezone-data for shell-mobile-providers.c
+RDEPEND="${COMMON_DEPEND}
+	>=sys-auth/polkit-0.101[introspection]
+
+	>=app-accessibility/caribou-0.4.8
+	>=gnome-base/gdm-3.5[introspection]
+	>=gnome-base/libgnomekbd-2.91.4[introspection]
+	media-libs/cogl[introspection]
+	>=sys-apps/accountsservice-0.6.14[introspection]
+	sys-power/upower[introspection]
+
+	>=gnome-base/gnome-session-2.91.91
+	>=gnome-base/gnome-settings-daemon-2.91
+	>=gnome-base/gnome-control-center-2.91.92-r1[bluetooth(+)?]
+
+	x11-misc/xdg-utils
+
+	media-fonts/dejavu
+	x11-themes/gnome-icon-theme-symbolic
+
+	|| ( sys-auth/consolekit >=sys-apps/systemd-31 )
+	i18n? ( >=app-i18n/ibus-1.4.99[dconf,gtk3,introspection] )
+	networkmanager? (
+		net-misc/mobile-broadband-provider-info
+		sys-libs/timezone-data )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/libxslt
+	>=dev-util/gtk-doc-am-1.17
+	>=dev-util/intltool-0.40
+	gnome-base/gnome-common
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+	!!=dev-lang/spidermonkey-1.8.2*"
+# libmozjs.so is picked up from /usr/lib while compiling, so block at build-time
+# https://bugs.gentoo.org/show_bug.cgi?id=360413
+
+src_prepare() {
+	# Fix automagic gnome-bluetooth dep, bug #398145
+	epatch "${FILESDIR}/${PN}-3.7.90-bluetooth-flag.patch"
+
+	# Make networkmanager optional, bug #398593
+	epatch "${FILESDIR}/${PN}-3.8.0-networkmanager-flag.patch"
+
+	# Revert suspend break, upstream bug #693162 (from Debian)
+	epatch "${FILESDIR}/${PN}-3.8.0-suspend.patch"
+
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Do not error out on warnings
+	G2CONF="${G2CONF}
+		--enable-man
+		--enable-compile-warnings=maximum
+		--disable-jhbuild-wrapper-script
+		$(use_with bluetooth)
+		$(use_enable networkmanager)
+		BROWSER_PLUGIN_DIR=${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins"
+	gnome2_src_configure
+}
+
+src_install() {
+	gnome2_src_install
+	python_replicate_script "${ED}/usr/bin/gnome-shell-extension-tool"
+	python_replicate_script "${ED}/usr/bin/gnome-shell-perf-tool"
+
+	# Required for gnome-shell on hardened/PaX, bug #398941
+	# Future-proof for >=spidermonkey-1.8.7 following polkit's example
+	if has_version '<dev-lang/spidermonkey-1.8.7'; then
+		pax-mark mr "${ED}usr/bin/gnome-shell"
+	elif has_version '>=dev-lang/spidermonkey-1.8.7[jit]'; then
+		pax-mark m "${ED}usr/bin/gnome-shell"
+	fi
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	if ! has_version 'media-libs/gst-plugins-good:1.0' || \
+	   ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then
+		ewarn "To make use of GNOME Shell's built-in screen recording utility,"
+		ewarn "you need to either install media-libs/gst-plugins-good:1.0"
+		ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change"
+		ewarn "apps.gnome-shell.recorder/pipeline to what you want to use."
+	fi
+
+	if ! has_version ">=x11-base/xorg-server-1.11"; then
+		ewarn "If you use multiple screens, it is highly recommended that you"
+		ewarn "upgrade to >=x11-base/xorg-server-1.11 to be able to make use of"
+		ewarn "pointer barriers which will make it easier to use hot corners."
+	fi
+
+	if has_version "<x11-drivers/ati-drivers-12"; then
+		ewarn "GNOME Shell has been reported to show graphical corruption under"
+		ewarn "x11-drivers/ati-drivers-11.*; you may want to use GNOME in"
+		ewarn "fallback mode, or switch to open-source drivers."
+	fi
+
+	if has_version "media-libs/mesa[video_cards_radeon]" ||
+	   has_version "media-libs/mesa[video_cards_r300]" ||
+	   has_version "media-libs/mesa[video_cards_r600]"; then
+		elog "GNOME Shell is unstable under classic-mode r300/r600 mesa drivers."
+		elog "Make sure that gallium architecture for r300 and r600 drivers is"
+		elog "selected using 'eselect mesa'."
+		if ! has_version "media-libs/mesa[gallium]"; then
+			ewarn "You will need to emerge media-libs/mesa with USE=gallium."
+		fi
+	fi
+
+	if has_version "media-libs/mesa[video_cards_intel]" ||
+	   has_version "media-libs/mesa[video_cards_i915]" ||
+	   has_version "media-libs/mesa[video_cards_i965]"; then
+		elog "GNOME Shell is unstable under gallium-mode i915/i965 mesa drivers."
+		elog "Make sure that classic architecture for i915 and i965 drivers is"
+		elog "selected using 'eselect mesa'."
+		if ! has_version "media-libs/mesa[classic]"; then
+			ewarn "You will need to emerge media-libs/mesa with USE=classic."
+		fi
+	fi
+}
diff --git a/gnome-base/gvfs/ChangeLog b/gnome-base/gvfs/ChangeLog
index d4a7684a7f59..c7777a8dae44 100644
--- a/gnome-base/gvfs/ChangeLog
+++ b/gnome-base/gvfs/ChangeLog
@@ -1,6 +1,11 @@
 # 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.206 2013/03/28 15:56:13 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/ChangeLog,v 1.207 2013/03/28 22:51:33 pacho Exp $
+
+*gvfs-1.16.0 (28 Mar 2013)
+
+  28 Mar 2013; Pacho Ramos <pacho@gentoo.org> +gvfs-1.16.0.ebuild, metadata.xml:
+  Version bump for Gnome 3.8
 
   28 Mar 2013; Agostino Sarubbo <ago@gentoo.org> gvfs-1.12.3-r1.ebuild:
   Stable for arm, wrt bug #458984
diff --git a/gnome-base/gvfs/Manifest b/gnome-base/gvfs/Manifest
index 2e57a32cac31..8deaaee231dd 100644
--- a/gnome-base/gvfs/Manifest
+++ b/gnome-base/gvfs/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX gvfs-1.12.3-gphoto2-2.5-1.patch 2925 SHA256 fb55f86c2602947b88b53c3ebc8c4c2f1b15e3eefa69dc8a1936f91c3e737020 SHA512 2acc9179ba8f0cbfbe4e96b2535458a38753319fe14c32bb69574254be79a32db8223e0003c67c520d613d78f1c681441798d4e52b1ad2671571c358f655d32a WHIRLPOOL 98e9d0a201a09bdeba79e0c9698d8aab5097a23c7d9100a7dec1feeed643895ce74ec4ac1e6215d34f151a4d0be36c06d3497fe1fe234323bf94372105f51fe3
 AUX gvfs-1.12.3-gphoto2-2.5-2.patch 1251 SHA256 9ac03fb241f16a095812e6cd4440ecca5d20819874c9ed285af353e2bdeca733 SHA512 d41b0848bf4f5d09e5e0479d4722da1c52d6af0e65f9f62631f1dfce2f2fdea7569a2e95057bedf2c1180d4c0c14accb330c15f444d20fcf8346b61b3356d10a WHIRLPOOL 04c91a5f31ba1bcf21c22ca98ce505ebf28344b815bafa8338167f723b7d9b779b979e2f183976b7da570a15bb2dd7ab1f3b66bc7def373ab7759f1e98187987
@@ -8,26 +8,18 @@ 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.0.tar.xz 1493176 SHA256 b0cf3ec2be053ef42a25a34c64b90fdf28a5334c595452ee2e246734696dd55e SHA512 0d03534ff084d0f8dbad0fc336e3c9bd62fa557189ca61ecd629eb3450d532308b198d9d9c59c82c926d1b7d0bf01b0a9e6bcd4591bf317c0fa30793d26fc038 WHIRLPOOL cab313c6f043a58b0f1526f8a53a504d38402c8cd30141a5c048b92d5f3d611f868fb0e58994682a728208f92bf1418c6637376b0690afcb43902c1fd532a4ef
 DIST libgcrypt.m4.bz2 1526 SHA256 ce9d04f9cbd5417e4d4ba91095c06cea4852c70d75716311e82dfc243d2f0128 SHA512 fe7916d01efb1d14c4d84ed37f3b53b04d3b005cb04b603bded8d24e147fe69a4c0823164483dba3bc95cf540eaf93a0c0ad59f29f8e1edbae9566a81be5900d WHIRLPOOL 6baa8ed005a691fb1f31ac420d801d20a1611519a38749718dcf3956557f40a058c24b988d20534a62084fadd4141c44893cfa751ebf8011cf55d83c759868dd
 EBUILD gvfs-1.12.3-r1.ebuild 3364 SHA256 b518844d019ea0b4850c5307d584b22f7e1164ca956416d6ddec972f130e066f SHA512 ec79e7e2432ada836b765acd7e5eb1edb575c238634d83badd3b956e31fde7a3ec2fcf61868eda4087d1eafa92d89147764775ebb09765db2a14531c7fd50824 WHIRLPOOL e831431c8d63c183cbc22ab992d7b42808e67add0eb2402e1996f8c772a44ffcfc33752acf7100e2ed244efe09cbf95b0781e1eea00297e320abbc2a562595b4
 EBUILD gvfs-1.12.3.ebuild 3455 SHA256 04c9e6e603853033f0bd829fb9cc069b94146d992565262a9d9be8a2b7458e2b SHA512 dccdb6a352a40801bd312d62b059055c864f2f200749fb1f91261b8243a397e35bc315ddaafe81794f2c51b5ae3055bb1bfb2928b72bb7052b112fe9c8e6d7e3 WHIRLPOOL a4498aaf7bba08b97572be70a182b87057ee8a031ca8162bba8867d562aeed90be061e1fe250c08e7268debcfad6e270f1034deedd3b49d5c530e06be1b2b08d
 EBUILD gvfs-1.14.2.ebuild 3818 SHA256 54d24deee019e14d06355b1430960d64e51fbafb7f14e2e84e38b48b0001ae0e SHA512 035f40bec065c8727a3223b3b86603ffab3ac2560aa94048d0c95ec1d466e9f95fe9589769c2103499957e19f8571d06db5e11eb215c7f84ae974f0aaaecf330 WHIRLPOOL 8e4d470b5750f6eb2aef5c07ef40dfb4459640d7ef696223b8b1a36377cf60240983570eb7ce7347b7b0e37a1a30f09d17f28d5f544a4f40eec600de9bc171b0
-MISC ChangeLog 29427 SHA256 04415b2d87fa503aab6acdab8851f3509678533d3160d41b4442cde3273eca12 SHA512 628719df7c638fac59ff42a4145e7f9f4673b77050a7b5f8629924b5fde48df4b90dd458e80cc6133771c2629d9050371a9f3b9c70a2be2861f7de593a1266f6 WHIRLPOOL 7cf157938ca114e6e730218149ea2100c0ad37bd55f74e2c81e6cf8884fb07c9adb4613a057a65230a559461a0eacc3840596829d72085d129d4457ed5e60b9e
-MISC metadata.xml 1315 SHA256 79981750cbbf2fd42c086917b23562c668ea309acd311ae4c613b9ff29f7d65a SHA512 affab515c5fffbf7ee84e7b3dd1358228a8fa78798aef7d6345660e768ab4da5155b4bf8e36a05142196a49e0406eb75e524d4b152401f2ff4abda47c9abc805 WHIRLPOOL ac5d023b3d2a57c3e7f89e705f03f42fc141e7ca83c03626baeb19fed17fd98e4b07f861201d3a6318006de6b349fb698b8d37d6fc33b56cb64810ca89aaf3b4
+EBUILD gvfs-1.16.0.ebuild 3562 SHA256 e18a7538f15c534e5cdd21a025e079532babfa27462f7f7e04a491c1a4a24e24 SHA512 fe642e157d6cfdf929476ccb0fb3754f25371a358baeba3e8040634355e769857f91ff9738b99b227e926d97202c4f8f55032e842374f8d2618969dbc289cb57 WHIRLPOOL 7e8f3704dcd7f1c7c9ba40c0ddfa9a0b9c94acce03cae27053cfbfea209cca5eb04c88e9a6e0948224891829ee8b84c177aeb19d804b4f8a734e2297107b45eb
+MISC ChangeLog 29568 SHA256 730bca8541fa711c8950c4f057ebf9cf849d7aea0039ca953345dde400a58ebf SHA512 216da26da76d411e5e5f01af658d67ed37340809dce7657d4e346d301b81281634c6f3d0797f9d4913dd9242610ac739126de96b78ecefc9bd58b35c36ebcb1d WHIRLPOOL ef739f02f4d61d56c243d299a2cb18c833a11c65a83b6da58d4b3fc48243d85c0e080dd23a78cbbe85c8edb468a7f5a9b1bcd6ff15b8c5c56f5ff7a3baadf833
+MISC metadata.xml 1440 SHA256 a02bc760008f281e624b5bb457002578368cbd4a6cd6c0022a8e6e7e7dda9603 SHA512 93e1c99b3108f240d9543a22c9ef67a1ab6baaa25d99bbe721d6fcba7e939b40bacabe727310d2ecda1200e3612c88a7245c55dfb2a3e25ef5afc20b69b59863 WHIRLPOOL 6c3357fadeba19ff338ece726468464973b74a37b40aeba8925ccf6eba41b46d8e2c62bfca58d4b7f83138df248cd4c0ccee418b66ab374d8eef045ba21d0717
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRVGeLAAoJELp701BxlEWfUVMP+QHH0jPXAhRp4CwDUrNXMgRz
-Br1LRxzxD1cF/0eHSHoKUvHnFe301wA4UHjSMsb2FJXur6pWHDcZFPMS4J/xAbnZ
-fRNKOV7FGPrkqG3MUkupj/nY9SlnCgNPsnC8hlhp+1n8TDLEHJ2suVfjPeNUSe6j
-KcopxRYJ6vYvF1XTXfzPebx/Dhk0vW2auxMMEj0VYXC/ylHOMqYxMuAJc1Vk/nTj
-8ZVgMRC7lYS/NAcqcMYQlFm1/37CXmpY4S1Rd6++TxxaWNzI55NZD2W4lewDPtjE
-iNGR/EWdlr04PubSK2OGm9jtkHhZlXF7JQStwABG4HGdNy2xp9bg0E7VlAGHvrqM
-sfDQRPq5aJWVishlhfa4Aw4CHr4rIQ9fWhnF/3ITlm3CXLfbPF26Ketm2m2SnU0w
-LD+hlCmK4p49Oyz75CyizVZkLAXF0JhpD2nZmiNdcBQuQdboCtLrfor61Wm0Uvuj
-+Ski6aK5slES3bRb5b7O/KycOOsSgMf+KlswE4SktTQdj0gKTKcsZp5W0n5IpOxE
-qj7hYovMXQG/c/jWXVkrNAb9KdMUzbCmeJkD0gljTHXKN4mZ+lOpT4MODHkFl2Fz
-Cu9T83dWDvd1SFff0MtZqGKOPTXUVIlVgDvJJAccGAX+SvQIkg1fx+yTTNGzjqm6
-m1GzyIP4uLy8ZzmejHaI
-=N3XB
+iEYEAREIAAYFAlFUyXYACgkQCaWpQKGI+9R7VQCfZsuoVGaPNL+z2DzZRqLen1lw
+8hEAoIHr/7svm0x8CKnR30NcmcmH41My
+=7b2S
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gvfs/gvfs-1.16.0.ebuild b/gnome-base/gvfs/gvfs-1.16.0.ebuild
new file mode 100644
index 000000000000..56acdde75c8b
--- /dev/null
+++ b/gnome-base/gvfs/gvfs-1.16.0.ebuild
@@ -0,0 +1,124 @@
+# 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.0.ebuild,v 1.1 2013/03/28 22:51:33 pacho Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit autotools bash-completion-r1 eutils gnome2
+
+DESCRIPTION="GNOME Virtual Filesystem Layer"
+HOMEPAGE="http://www.gnome.org"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+
+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"
+DOCS="AUTHORS ChangeLog NEWS MAINTAINERS README TODO" # ChangeLog.pre-1.2 README.commits
+
+SRC_URI="${SRC_URI}
+	http://dev.gentoo.org/~tetromino/distfiles/aclocal/libgcrypt.m4.bz2"
+
+IUSE="afp archive avahi bluetooth bluray cdda doc fuse gdu gnome-keyring gnome-online-accounts gphoto2 gtk +http ios samba systemd +udev udisks"
+REQUIRED_USE="systemd? ( udisks )"
+
+# Can use libgphoto-2.5.0 as well. Automagic detection.
+RDEPEND=">=dev-libs/glib-2.35:2
+	sys-apps/dbus
+	dev-libs/libxml2:2
+	net-misc/openssh
+	afp? ( >=dev-libs/libgcrypt-1.2.2:= )
+	archive? ( app-arch/libarchive:= )
+	avahi? ( >=net-dns/avahi-0.6 )
+	bluetooth? (
+		>=app-mobilephone/obex-data-server-0.4.5
+		dev-libs/dbus-glib
+		net-wireless/bluez
+		dev-libs/expat )
+	bluray? ( media-libs/libbluray )
+	fuse? ( >=sys-fs/fuse-2.8.0 )
+	gdu? ( || (
+		>=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 )
+	gphoto2? ( >=media-libs/libgphoto2-2.4.7:= )
+	gtk? ( >=x11-libs/gtk+-3.0:3 )
+	http? ( >=net-libs/libsoup-2.34.0[gnome] )
+	ios? (
+		>=app-pda/libimobiledevice-1.1.0
+		>=app-pda/libplist-1 )
+	samba? ( >=net-fs/samba-3.4.6[smbclient] )
+	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
+	>=dev-util/intltool-0.40
+	virtual/pkgconfig
+	dev-util/gdbus-codegen
+	dev-util/gtk-doc-am
+	doc? ( >=dev-util/gtk-doc-1 )"
+
+REQUIRED_USE="cdda? ( udev )"
+
+src_prepare() {
+	if use archive; then
+		epatch "${FILESDIR}"/${PN}-1.2.2-expose-archive-backend.patch
+		echo mount-archive.desktop.in >> po/POTFILES.in
+		echo mount-archive.desktop.in.in >> po/POTFILES.in
+	fi
+
+	if ! use udev; then
+		sed -e 's/gvfsd-burn/ /' \
+			-e 's/burn.mount.in/ /' \
+			-e 's/burn.mount/ /' \
+			-i daemon/Makefile.am || die
+	fi
+
+	if use archive || ! use udev; then
+		# libgcrypt.m4 needed for eautoreconf, bug #399043
+		mv "${WORKDIR}/libgcrypt.m4" "${S}"/ || die
+		AT_M4DIR=. eautoreconf
+	fi
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# --enable-documentation installs man pages
+	G2CONF="${G2CONF}
+		--disable-bash-completion
+		--disable-hal
+		--with-dbus-service-dir="${EPREFIX}"/usr/share/dbus-1/services
+		--enable-documentation
+		$(use_enable afp)
+		$(use_enable archive)
+		$(use_enable avahi)
+		$(use_enable bluetooth obexftp)
+		$(use_enable bluray)
+		$(use_enable cdda)
+		$(use_enable doc gtk-doc)
+		$(use_enable fuse)
+		$(use_enable gdu)
+		$(use_enable gphoto2)
+		$(use_enable gtk)
+		$(use_enable ios afc)
+		$(use_enable udev)
+		$(use_enable udev gudev)
+		$(use_enable http)
+		$(use_enable gnome-keyring keyring)
+		$(use_enable samba)
+		$(use_enable systemd libsystemd-login)
+		$(use_enable udisks udisks2)"
+	gnome2_src_configure
+}
+
+src_install() {
+	gnome2_src_install
+	dobashcomp programs/completion/gvfs
+}
diff --git a/gnome-base/gvfs/metadata.xml b/gnome-base/gvfs/metadata.xml
index 5bdb749c0776..b1167dd91dbf 100644
--- a/gnome-base/gvfs/metadata.xml
+++ b/gnome-base/gvfs/metadata.xml
@@ -18,6 +18,7 @@ applications not using gio to access the gvfs filesystems.
 	<flag name='fuse'>Enables fuse mount points in $HOME/.gvfs for legacy
 		application access</flag>
 	<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="udev">Enable udev base replacement code for cdda feature</flag>
 	<flag name="udisks">Enable volume monitoring using <pkg>sys-fs/udisks</pkg></flag>
diff --git a/gnome-base/nautilus/ChangeLog b/gnome-base/nautilus/ChangeLog
index 185b0ac93a94..6e9f43ef455e 100644
--- a/gnome-base/nautilus/ChangeLog
+++ b/gnome-base/nautilus/ChangeLog
@@ -1,6 +1,11 @@
 # 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.405 2013/02/25 09:24:31 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.406 2013/03/28 22:51:39 pacho Exp $
+
+*nautilus-3.8.0 (28 Mar 2013)
+
+  28 Mar 2013; Pacho Ramos <pacho@gentoo.org> +nautilus-3.8.0.ebuild:
+  Version bump for Gnome 3.8
 
   25 Feb 2013; Zac Medico <zmedico@gentoo.org> nautilus-3.6.3.ebuild:
   Add ~arm-linux keyword.
diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest
index a9078c356aaf..867f76887840 100644
--- a/gnome-base/nautilus/Manifest
+++ b/gnome-base/nautilus/Manifest
@@ -9,15 +9,17 @@ DIST nautilus-2.32.2.1-patches.tar.bz2 6984 SHA256 0b756ba661d1f9ed0d2e49a469e6f
 DIST nautilus-2.32.2.1.tar.bz2 6350203 SHA256 802dacc98c697afea2e6201dab1c8c800809f235fff39857983efb4340ecc303 SHA512 cb9d65d16c8d771d182bb94d9de59c4054b05603b8ad33beeca26b41c3ca3c84581b596625f6503924c4a26f5ca1218c6d1e81c9d94e6cc637a3e8a941cde9b4 WHIRLPOOL c98d2750f5b32896c67d1fc6060e1c288296a4a86142fa35eb261f8630fdd92ad974cf3bd66d3843f0073c7ec96081afd01063c4c2d10d70059efc58da9a2fa0
 DIST nautilus-3.4.2.tar.xz 4583996 SHA256 752afa41189b0b6c73dc3769cd885e184c29d6d394345ec05cd48b0004e0f452 SHA512 a842488f58ed5c53a24c99b0f632b58fe7b67e58e8f05d4836adc5cbf4a1fe9754e65a3bc779e35a4d6b2efca482358c1fa4f7284b3b6b5e8b31a54466e1e210 WHIRLPOOL 83bf067fb3c64446e549dc402593eed3e89e0b494fa55527ff2cb8c3606520d77567a5a8e131521eab915f9599b455cd1a04aa157b72b14c88cd65380dc884d4
 DIST nautilus-3.6.3.tar.xz 4959376 SHA256 d272027754ce8591959ae854fc6b5f43eee4af31e4eecf06de727acebe0ee46c SHA512 f90ed3253889764dc3799e53555a9d6e84876b5d5ea020ba34b643df460f703acbba85bba0cf468ea7d614ec954b49304e46a27d46459b4aaa7e53ecd9467895 WHIRLPOOL afe1f70635899aaa3e7b8df575cef9f810c84acd1c63c5a1359584274c689872b1fdfc5e31a6964a419ee0e85c2cacce357a2098052db24d46a980363fd7c923
+DIST nautilus-3.8.0.tar.xz 4979332 SHA256 c9b4096eb64006307bfd55640033191ab379c88ee8652e8203118a3ca9864e11 SHA512 a78a815515ddd6ee6f9d59659551741b832a93b11858e35a5849a414967fd9fc471e63e44e1fc8fefff073e68ad0e954584dd11acc8f43bd64b634937db8cc1d WHIRLPOOL 0a1b6daa10db6c2eaef69bc64e123b8b477e4e243906b94ce1d20864e458acbab7ad11022cfcd169123c7a411a6761c4b3d9cc16edfba10414d1a087f78c506a
 EBUILD nautilus-2.32.2.1-r2.ebuild 2225 SHA256 0a9fd9c598526e17a80c185b74620db7d3fc7f5a8cee09016df74ba04e490bda SHA512 db21cd14f90f55a633a0cd8538148e12efbf20a5633a61024f521e40d1a1f60b72efe4b6ecfbfb3ae96d4032800be17a5cfab15c2d39b11d76e7d8dc344ad66f WHIRLPOOL baa604a25dccbc7955d692dd126453f589db4499c96dff39a7445970fa8e70e5f814613d33658eb85d4f61bcbe9bcf65f4fc67d82cc04aa1ea40a0dbb0a5acea
 EBUILD nautilus-3.4.2.ebuild 2934 SHA256 d884ed2fa167807b8c729cff464d134e1f75361f1900ee01d0345246ffd41b2c SHA512 a58d858fb0ad2cf968e4f714038cc01e59bb83d8424a9f197b0106f53586560875caab47f18af8d3497cacff5fa6f672247cd2c7a96445269271d5dd639867f6 WHIRLPOOL 8dc3bfd3116ae9054809ef524626b892cfc6019414f0c17a9aa908c87e93322bd1e6079cc3074da7430121a73c978cc49ce4ae304fbac71ea13f3b6de41df5e0
 EBUILD nautilus-3.6.3.ebuild 3297 SHA256 61455105d63f8fd371e4d07f2f2b7d1c174bd35df4c2ef4208a1a2c138776d32 SHA512 738e96366caf295c591b55125d4993bec19e023a86ac613ab603d7b26eac8ea2b02c3e44e23ed4dddbb33736d3a10ff68be83c9faaa3111a5d3380bed1aea0d0 WHIRLPOOL 2e15378116a00a1bfbf791cb2637e5efa04b6a978fdf011baf31ec81261ed22f01262c0e71ed0d96af1db939ee456cc54336f20c9cd0ec853677dd0f20da97d9
-MISC ChangeLog 61563 SHA256 34de3b5a7e6d1622f848e3c35a337d622a354e0f455b0b766fbb2cbb63f65ac4 SHA512 6f9fa9140b76811f4708cc01d79cc5c856871b5e5fe34284b8d18c83341a92a434373e148d2727b4eac2cd668b86aa82fc5efc831072aa525ea9d57897882cf6 WHIRLPOOL 1c39eb3015037b81f8b34493d965d8b1fc44f564598c0a0a5be52c33906c6acc24f954e8687a0a459daa2756580da17666f83b3314d2f11d2526cce7486b94bc
+EBUILD nautilus-3.8.0.ebuild 3272 SHA256 af737dddcf9669c13e2fb8d65946f6d2a38d533c27a81f92aca7b1a1f97f7b5d SHA512 97250272afbd2631a782ca3d7131066f242664915e8cb3a8cbb1f1801e626c393a99221624b5bff8faa149bae1005597567c6dd93089bac8c2ee3ebd303f279d WHIRLPOOL 5b69f47a5dcb0b91702ce124cd531ea0db7e557e7ade930d8acf7dc5dffbe79204c5a06f11d6ffeef6f9ab5f12d19353b58ecc7e3a919ccdae1d597c45269270
+MISC ChangeLog 61692 SHA256 dc348cbbd049d15579749368cc27b5f209c23d4fe1cb80b02cb075c6d7b03545 SHA512 2fad7955a8d9f4537d5c420e72dfc95d7649efa392b5aa8564d2e67c784e2d97b512bf4df11a3940216b33525d82747fdc172f255237df4a3dd5a4964a7069ed WHIRLPOOL 8046e949f70d7156bd0dd282773a541cff35327eb8bdd83e6a2d92e9c01632734ed57b5652818dd6166c0f623d2316b4a1c3311083991a9e248c850e806dc319
 MISC metadata.xml 566 SHA256 c278ed8fe54c80b07d7b2495826346538a7daaeea11dd9bdeff87ec0a30e74a1 SHA512 daefe3974dae1d708f909a2207f2d09128ab045f8aee11c823093da779e3f283c59459a0f4962631b1508dc545b6ab448c1ead519839011ddeb619f4017f802a WHIRLPOOL b662f3823904bc970b1a8bcd4ca863a7726eb89c76ef4c1d6954ba4b720f4d7490b4cfcf1d30b683a8ecf562d74977598db7b976ec4eea943e86aa07c4dde28b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlErLdEACgkQ/ejvha5XGaPqAQCfQVCai+3Yyo/RG6RE88b5w6G/
-a98AoM9+RQ3IIkv5zW8Km1f3qwa8gK25
-=SwsA
+iEYEAREIAAYFAlFUyX0ACgkQCaWpQKGI+9TXTwCcCHtcv0EzvFKoXKabRnhvWBSv
+v/8An3Uy835zcVA7COZTWC/KP+15nl5o
+=GaTv
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/nautilus/nautilus-3.8.0.ebuild b/gnome-base/nautilus/nautilus-3.8.0.ebuild
new file mode 100644
index 000000000000..0709434487d1
--- /dev/null
+++ b/gnome-base/nautilus/nautilus-3.8.0.ebuild
@@ -0,0 +1,111 @@
+# 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.0.ebuild,v 1.1 2013/03/28 22:51:39 pacho Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+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.35.3:2
+	>=x11-libs/pango-1.28.3
+	>=x11-libs/gtk+-3.7.7: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.16:= )
+	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
+}