Version bump for Gnome 3.12.

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

6 files changed, 309 insertions, 14 deletions

diff --git a/gnome-base/gnome-shell/ChangeLog b/gnome-base/gnome-shell/ChangeLog
index 9c9d22a4888c..4d137d16fb94 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-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-shell/ChangeLog,v 1.73 2014/04/26 08:22:29 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-shell/ChangeLog,v 1.74 2014/04/27 16:59:22 eva Exp $
+
+*gnome-shell-3.12.1 (27 Apr 2014)
+
+  27 Apr 2014; Gilles Dartiguelongue <eva@gentoo.org>
+  +gnome-shell-3.12.1.ebuild, files/gnome-shell-3.10.4-bluetooth-gold.patch,
+  +files/gnome-shell-3.12-bluetooth-flag.patch,
+  files/gnome-shell-defaults.patch:
+  Version bump for Gnome 3.12.
 
   26 Apr 2014; Pacho Ramos <pacho@gentoo.org> gnome-shell-3.10.4-r1.ebuild,
   gnome-shell-3.10.4-r2.ebuild:
diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest
index 1f8a22a7779b..f8c3c7e6bb6f 100644
--- a/gnome-base/gnome-shell/Manifest
+++ b/gnome-base/gnome-shell/Manifest
@@ -4,22 +4,25 @@ Hash: SHA256
 AUX gnome-shell-3.10-bluetooth-flag.patch 1777 SHA256 e792a8d9cf2e352eaff19826c2fb3ab2b7b13864c3ff0d7d646f003c647d8c88 SHA512 3dc2a949a0b139dcb51df1e353ff4ca90631e57858c0be1d80467fda32aa080de18d26b593d97854f3c2e5a5ea93b168c37c4ddf9006fded5afddab87af44233 WHIRLPOOL 8ed260aa62418131f63dca628b09b83ef4b963e25dd79f194f413bc6961066055b1f49d875a9739a747c4f17d3700dca212ddceb2e4be14b7dd6602f9ca97610
 AUX gnome-shell-3.10-networkmanager-flag.patch 8935 SHA256 5fdbc3206b3fb67f216128d988b90a3be9070ac1abfebc8ab33cbf95478849dc SHA512 7cc0d58f12559195f065756c06bb6511ac4dd87d3f8c56204aeb8d0d4145dbc7bcd223fd780a68b6efe089c28d970e4099d816112e557258e4c967e5c8a5dfdf WHIRLPOOL a03e4164c809d88d8e389d4073086dd2272588962ab434c006536677e9f1d305b4e892ed1c524088e9b1da0698de6b869148546524b00f631fb25248145d0ef7
 AUX gnome-shell-3.10.4-activate-workspace.patch 1734 SHA256 6bb2f0c3e07e70d57c0fc8d2a6e5fa6344d4a5c89ef615e58eb3715023ad108e SHA512 4298925152e1484b86d5067bff077cbc0d468fbe3bb95389fa31683ab185e70347cfb9c77756f03651750d6d37c7fbd2587d5bcdb4400f31a8a52d544b52878a WHIRLPOOL 22ac28dbf8555ef248596eec1ee9691969d73f2b75d767c1ba97be58561597ded01056a4025dbfeb9aa0abfdcf8ba2118895f3f1c499e59763b06c4966c4bf43
-AUX gnome-shell-3.10.4-bluetooth-gold.patch 1194 SHA256 e6882c21ae2cc9b61792008ae97e31efff2b99c7e43148ef9bf155d4ce0b074c SHA512 b85d8e82b39512c2a243e0e791be5e071b245b51aa6825e239008898b4c1a7263fcf3c09281ce2699366a79516a2820da0fef4d202c7aecc871818fdda12b799 WHIRLPOOL 1633b01d3b5fae4acb65d64f53d46712844f5d106e6ad3b0289a738cea1c4ad65cba57fc58bfd15076dc49d8f9113ce568fc44815d9a0fbe654713f60f498e40
+AUX gnome-shell-3.10.4-bluetooth-gold.patch 1198 SHA256 b92fd31343348e0c7ce3420899e04c454edad388a6489ab19be6ed2461c7dc41 SHA512 1e5eb7aa8a36e7f2bbdde25e0d9796c3041035f6213a8b6b344fc9ef511f8cff65868d09f1e83ca6dc2a5ca01fd7f4f112435fba0b5eb487736d206dcdd32249 WHIRLPOOL 0f78e39364b2f508778bb298ba52759944148d93aee924db4a2b79941352b7b70fd1c3bab5f6f58d1827e83ec86c95ba36530a8f79a5bc2ad84b37f910e16af5
 AUX gnome-shell-3.10.4-broken-crosshairs.patch 7540 SHA256 f0065fb557368644cef74ab25d5e67088f1888c5d95487c0df32f0def75aa4fb SHA512 1a56d68b735abcf4be52206f4b8499904d7561f7d372d7e465cd837bcfd751e80433a0e7dfdaf3833076313bd8311bf12f918744d8b296d750909755414e5204 WHIRLPOOL 3fb856432e83bf1bb53f9409c5e15040ac7490f65bc8e6c7c47b13d6b43114d8f0a12766ba20e7cf652ef3c59b88684822f4aa56efec94fdaa3173203f088ea3
 AUX gnome-shell-3.10.4-fix-background-manager.patch 5674 SHA256 ed257838b97dfb63f2e0ddfd338a21efe5485e6c0b54da6e9d82a3aae9326c2f SHA512 7da462a0b8f5e99f49f3bd66afe652fa1dd9f2d366a60b4349098183d08f6f6a631a9063edba5874d45f5c07b0813a1ce0933ac6a8eef4fc708bab8a1b78ea2a WHIRLPOOL 03cefd14412e3f526f0417452ca37d024e7e1a649ebdb52673117d420147540ae96a342cf1af7f63414091bf0d5f0e3abe9e992ac6c129197e771553ce3ac645
 AUX gnome-shell-3.10.4-restore-pref.patch 1324 SHA256 7439ea6ad9342d084b5212fea8e662b614edf256fe08f155c985c83fb6e27e81 SHA512 3dd50e163ca658bc7a0d4bac584848abb8265c973adcd040d702e69bdb6877cfb09f48b6a574ee064fd2c1feef5248d63e59a5c0d423ee4841a178f02c3cacb5 WHIRLPOOL 1cc2af4a0b43af7500f241ea12d61a39f77e15cffd5bb1893e713183286a5286342a051ced766cb7052dcb7b6e604c53989ce4c6363f08ffec449b70ec42b382
 AUX gnome-shell-3.10.4-scale-factor.patch 1223 SHA256 f5912f9c079ce6a7774c9f3a615b0ea86441cd43437f20ac6f79307abd1328a9 SHA512 089a03b56cac4d51cddf5bf38076b29b4b7659283c50b619445091cf78fe762ddc14bd5cd5db4a10a3a988647bf16c89a27ed4674802a412cc6008916dfcb4d2 WHIRLPOOL e96454a6b1c7fbeb9ea8db681b9e67a0b7774c889ef9e9ffe1d6a24efc6ef62aa2ac8b6c1197c7a3e7426d3c4878f4c7b799dc5b9dcec5e171ce5b1d746596f9
 AUX gnome-shell-3.10.4-wired-network.patch 5804 SHA256 14f61ee92b4f01bc39454e121ea9cf62590ed0f178d111eca000a0ce5c4028fe SHA512 d04dfb8461e970a926b4ef4a386fd01ac8964c2d6a37a8d4d399f0419fedc3a2159f5f6b480ca94225845656d36076a8ebb83e4f0e1734915035aae6a321190a WHIRLPOOL 2923e3005649f4cf6fef3419694df365907abd630a94c5a8fd2511632bed45776cb052a904b96b0e212266cf93b1763a0553abc007986477e0291315a3b94b2d
-AUX gnome-shell-defaults.patch 889 SHA256 83ddd289cc3a6ab29a7e8b4a19d2d10a7ffd05700a85f288fda8ccc077b3aaf7 SHA512 440d6d87569589e234a3251d001262d59aa835b279b9535820b83ed11ed0f7e00ce945814f0a3212024e3bda5cd04b49c1bbc6e98703cd6251cd1fa0baa6d1a1 WHIRLPOOL 20532252b8af581bcb243d5884ad0214f2921fffa3ee7190d8d12cf4b3b5cde758fd1ac21afc721030c239082bb708750f1f502e4ab856e32cdd3bc515ad1756
+AUX gnome-shell-3.12-bluetooth-flag.patch 1894 SHA256 1da61704c51128de9b17fcca022e9c4d8d1d3b7def9b3e7ef50e2bc6d13fa256 SHA512 dc18e16e2de667bef09d66acd68fbe0f4d8c0fd1725b352b0f9f4032e43481f2655b1812ffa6f8ae8441b215a372c27f5e1035b7eceeeb22ee18b1a256e79f80 WHIRLPOOL aa98031a3152d570342fb249c3609d6387b6dea1d451e71ecf880c7de412aa493ad414db7e15217bac0775625419fa8ede13c5f61e055ad735d60dbce86fd6e6
+AUX gnome-shell-defaults.patch 1266 SHA256 eeea87bd5f02b3da83435c69d44a57e85d0ad58a62f72a350b55e0efac0f2584 SHA512 36c08779466884e1dce41460e56d0b9c82ca07bf2fee491d48604ae6f511dccfcf2bb3fdb1a7213aa47f08d0ec37da798465480ce12444dd22711bb4daec642c WHIRLPOOL 04669a7b93b7440e55d6ce71f43b9a90df531e6a72093c3ac61f775213a66a6e856538b5836a5962169d54746591dc246e12e3d532b2cc6af022092c82b9efe6
 DIST gnome-shell-3.10.4.tar.xz 1521256 SHA256 e082f6847eedbbc474ffe4bcb3dfe51054eb0e4c5ddab440d39afed78526b726 SHA512 bb69942bb1ab97e896ed69b48360c99a1a870074b0bfe16dc546fcb3d23a970b95b7f3bd3f9bac85a73a0fc0c5d7c8b8c08054d28abb5aa80b7b79c918532167 WHIRLPOOL aa2678a9b19e2c92823b0d555d1b88869112796c3876433a3886086a22a25b4cb4c77908d7e82c76430fbfba535af0f2b9791b79be5c7aa3f57575c8c3372d4f
+DIST gnome-shell-3.12.1.tar.xz 1541420 SHA256 d5a475f390d992de03ccf8ffeafec90595da700594eba9fc0688cbb1652b5516 SHA512 a6c811def3933107eb9e69614bb484ef7cf308ee32a7447560d38e0d2115fddd8ba9fb839c683222c5c7a9691db9afded0ddc0725f498a0adb79670b544cb3bf WHIRLPOOL cbe84c2ae7d9d78e2151ad01a34ddeddbcbcc6209434d2cb6590bd931fb56a8a52c9b480b3ef4421832076fcbec25f42658d9568a3147538a860594670a1dade
 EBUILD gnome-shell-3.10.4-r1.ebuild 7773 SHA256 96e311e5efcccf7245eeb3502654b058816cdaff435a3663b42a86dfa921a031 SHA512 751da3034006ea4951e74fdba4d4c9cc2d31c656246e69edb43cac4ad2dfe29b7cc543dbeac0676f5c98e0d3d4f44120e1fec51cceebf249ef620a6837f76cfb WHIRLPOOL d94c88699a2d5242dcdc2984c8db57747a7cd238647f327083c6b520655e5c20f9aba814fb14177a69f5db1246ceee4de41dbcaca0fd9dcdda5de11c5db6fcda
 EBUILD gnome-shell-3.10.4-r2.ebuild 8351 SHA256 6d2e8f862c021133af436dcfa9025edfd842a24c15403db58ebccd30e1866c9e SHA512 1ce0b9408216fa0a12158738d5a98516f110a5072216b7d8ffcb3c80e6bb6611bafddc0dea0aad76f67917c7b192ae22f063ed36be1ec4fa9a955bd9fa4d39f3 WHIRLPOOL 3779a8daaa0b117d114af9fb373037b772fa9de33e16c7a1e24120a191fd7d25a80b268275b06730d51b6fcc45933eacb10324e19f0cf510e33b7fc3914b0ca1
-MISC ChangeLog 16301 SHA256 82916b8a76b4faba89ba1d1bad83e53e0b0f0b9e47a270b29401f68a9a77506b SHA512 7d99dc13e123553df032dfdbf4f63ddeda0479c343dd0ebca1738c38b26953032ebb02d11b8aceaf1ff2b7682cd8a0bd46e4e5358f42ff5bb2b0e95086d22c3b WHIRLPOOL 59a7fbf2be8d97f9b9e88d364969674814e2e55fd763a23c7c544140c481be5fbc6891818b4c08dec15b85c6a37727fe0c288bdfde2dbafe00d9ed6f4deec8af
+EBUILD gnome-shell-3.12.1.ebuild 7552 SHA256 57f2a00a68a24991a2a3324d47b5b541f42107e93b8afb9bd318ab75b6a1c59e SHA512 bafc80a21aef826ba2072fbf90ceecd739738991588425dc791c4860dca2d282f7eb364dbb3c0accc653e335ce358282b1f2bff3caee6a77f3fe61333e8bf61e WHIRLPOOL 4e43b9cb48539172be05a443859ef7509eaa6dfff5ce2c1cd777dc8cd85f356e9c4b83f2cd9ba39dcb671226396464a4612740e6a4db6e1cbf258ae023503456
+MISC ChangeLog 16581 SHA256 d6e01eae9b9c3513bb44c5240e6c28b9d1d0e7154a1278ed324782bdb6259954 SHA512 348d6672ced5e235f715e7b9438ec3d65017d181ab7ba85e376b56485a4c068abc41878243659788bcc68952d2e72bb9379f14338a4692249bd3ac90ef30454a WHIRLPOOL ad245934343e071e078271175fbd29947fea12eb734754e98e4a3829055c883794fcc7f2fde867c7aa9c33f9367af71d7406e3d61573efeb380eec203ceb0017
 MISC metadata.xml 503 SHA256 3b98b49418c316196a011c8706d99612da0dccfc184a11c2b4e2af912190384e SHA512 0e4a7bcc41c9edcbf0882f24427ab29ab8631cb3fdeca8b68734a143987012a66b6383c97dff57c5afd33d93b5da913d0755e6a9607101987bf9413e58551235 WHIRLPOOL 3eec055b8a58e6af24a72a1a8f4a544766aec38fe2c237a26c63468f63e98a2d4c4bb77254bf1dd0498ecb070aefce65da1cbb3dd77cf26c34449d8fc1cc83df
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlNbbMYACgkQCaWpQKGI+9Q61wCdFHc9/IguKzexgSLvzSy6AAvn
-WdQAn0zV9CCLFzAs9e2R+Ts2PP55FAf7
-=FiH5
+iEYEAREIAAYFAlNdN2sACgkQ1fmVwcYIWAaQigCfcG8dIbU67AkAxt8csLF6KuEP
+QcAAoI/X4VG7fh3cqTSkIbbKNBX5paQm
+=k3rg
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.10.4-bluetooth-gold.patch b/gnome-base/gnome-shell/files/gnome-shell-3.10.4-bluetooth-gold.patch
index 544648b62a12..b688dd623cfb 100644
--- a/gnome-base/gnome-shell/files/gnome-shell-3.10.4-bluetooth-gold.patch
+++ b/gnome-base/gnome-shell/files/gnome-shell-3.10.4-bluetooth-gold.patch
@@ -1,7 +1,7 @@
-From 92ad0e5a9dca44249639d71a089bfd7159ee6f65 Mon Sep 17 00:00:00 2001
+From 9f056842fad21dc69a51fd9f01543cd85a6d4047 Mon Sep 17 00:00:00 2001
 From: Alexandre Rostovtsev <tetromino@gentoo.org>
 Date: Sat, 15 Mar 2014 17:48:41 -0400
-Subject: [PATCH] build: Add BLUETOOTH_LIBS to libgnome-shell's libadd for
+Subject: [PATCH 3/3] build: Add BLUETOOTH_LIBS to libgnome-shell's libadd for
  ld.gold
 
 For ld.gold, adding BLUETOOTH_LIBS to gnome_shell_LDADD has no effect:
@@ -14,10 +14,10 @@ https://bugzilla.gnome.org/show_bug.cgi?id=726435
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/Makefile.am b/src/Makefile.am
-index 8041052..a4aefde 100644
+index f489a56..79838a3 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -301,7 +301,7 @@ libgnome_shell_base_la_LIBADD = $(libgnome_shell_libadd)
+@@ -320,7 +320,7 @@ libgnome_shell_base_la_LIBADD = $(libgnome_shell_libadd)
  libgnome_shell_base_la_CPPFLAGS = $(gnome_shell_cflags)
  
  libgnome_shell_la_LDFLAGS = $(libgnome_shell_ldflags)
diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.12-bluetooth-flag.patch b/gnome-base/gnome-shell/files/gnome-shell-3.12-bluetooth-flag.patch
new file mode 100644
index 000000000000..2fa93af25cd0
--- /dev/null
+++ b/gnome-base/gnome-shell/files/gnome-shell-3.12-bluetooth-flag.patch
@@ -0,0 +1,50 @@
+From 3c9c3b19fcb212171036e1e57e749411b5fd7d65 Mon Sep 17 00:00:00 2001
+From: Sobhan Mohammadpour <sobhanmohammadpour1@yahoo.fr>
+Date: Thu, 28 Feb 2013 18:48:32 +0330
+Subject: [PATCH 2/3] Make bluetooth support optional
+
+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 | 16 +++++++++++++---
+ 1 file changed, 13 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 9a30e65..aa710f0 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -138,11 +138,21 @@ AS_IF([test x$enable_browser_plugin = xyes], [
+ ])
+ AM_CONDITIONAL(BUILD_BROWSER_PLUGIN, test x$enable_browser_plugin = xyes)
+ 
++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_MODULES(BLUETOOTH, gnome-bluetooth-1.0 >= 3.9.0,
+-        [AC_DEFINE([HAVE_BLUETOOTH],[1],[Define if you have libgnome-bluetooth-applet])
+-	 AC_SUBST([HAVE_BLUETOOTH],[1])],
++	[AC_DEFINE([HAVE_BLUETOOTH],[1],[Define if you have libgnome-bluetooth-applet])
++	 AC_SUBST([HAVE_BLUETOOTH],[1])
++	 AC_MSG_RESULT([yes])],
+ 	[AC_DEFINE([HAVE_BLUETOOTH],[0])
+-	 AC_SUBST([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.9.0
+
diff --git a/gnome-base/gnome-shell/files/gnome-shell-defaults.patch b/gnome-base/gnome-shell/files/gnome-shell-defaults.patch
index b88ca809599a..80634c100d19 100644
--- a/gnome-base/gnome-shell/files/gnome-shell-defaults.patch
+++ b/gnome-base/gnome-shell/files/gnome-shell-defaults.patch
@@ -1,6 +1,17 @@
---- data/org.gnome.shell.gschema.xml.in.in~	2013-07-30 22:57:44.000000000 +0200
-+++ data/org.gnome.shell.gschema.xml.in.in	2013-08-23 11:19:00.002182266 +0200
-@@ -32,7 +32,7 @@
+From 4fd7696fc9f392a11b91fa3fc7fe14ac7734ee62 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Tue, 10 Dec 2013 23:33:51 +0100
+Subject: [PATCH 1/3] Alter list of default applications
+
+---
+ data/org.gnome.shell.gschema.xml.in.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/data/org.gnome.shell.gschema.xml.in.in b/data/org.gnome.shell.gschema.xml.in.in
+index dc27e47..e8de0ed 100644
+--- a/data/org.gnome.shell.gschema.xml.in.in
++++ b/data/org.gnome.shell.gschema.xml.in.in
+@@ -22,7 +22,7 @@
        </_description>
      </key>
      <key name="favorite-apps" type="as">
@@ -9,3 +20,6 @@
        <_summary>List of desktop file IDs for favorite applications</_summary>
        <_description>
          The applications corresponding to these identifiers
+-- 
+1.8.5.1
+
diff --git a/gnome-base/gnome-shell/gnome-shell-3.12.1.ebuild b/gnome-base/gnome-shell/gnome-shell-3.12.1.ebuild
new file mode 100644
index 000000000000..1b865e8088f6
--- /dev/null
+++ b/gnome-base/gnome-shell/gnome-shell-3.12.1.ebuild
@@ -0,0 +1,220 @@
+# Copyright 1999-2014 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.12.1.ebuild,v 1.1 2014/04/27 16:59:22 eva Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_{6,7} )
+
+inherit autotools eutils gnome2 multilib pax-utils python-r1 systemd
+
+DESCRIPTION="Provides core UI functions for the GNOME 3 desktop"
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell"
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+IUSE="+bluetooth +i18n +networkmanager -openrc-force"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+# libXfixes-5.0 needed for pointer barriers
+# FIXME:
+#  * gstreamer support is currently automagic
+#  * mutter/mutter-wayland support is automagic
+COMMON_DEPEND="
+	>=app-accessibility/at-spi2-atk-2.5.3
+	>=dev-libs/atk-2[introspection]
+	>=app-crypt/gcr-3.7.5[introspection]
+	>=dev-libs/glib-2.39.1:2
+	>=dev-libs/gjs-1.39
+	>=dev-libs/gobject-introspection-0.10.1
+	>=x11-libs/gtk+-3.7.9:3[introspection]
+	>=media-libs/clutter-1.15.90:1.0[introspection]
+	>=dev-libs/json-glib-0.13.2
+	>=dev-libs/libcroco-0.6.8:0.6
+	>=gnome-base/gnome-desktop-3.7.90:3=[introspection]
+	>=gnome-base/gsettings-desktop-schemas-3.12
+	>=gnome-base/gnome-keyring-3.3.90
+	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-libs/libXtst
+	>=x11-wm/mutter-3.12.1[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.9[introspection] )
+	networkmanager? (
+		app-crypt/libsecret
+		>=net-misc/networkmanager-0.9.8[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. Systemd needed for suspending support
+# 6. xdg-utils needed for xdg-open, used by extension tool
+# 7. gnome-icon-theme-symbolic and dejavu font neeed for various icons & arrows
+# 8. IBus is needed for i18n integration
+# 9. 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-3.8.3
+	>=gnome-base/gnome-control-center-3.8.3[bluetooth(+)?]
+
+	!openrc-force? ( >=sys-apps/systemd-31 )
+
+	x11-misc/xdg-utils
+
+	media-fonts/dejavu
+	x11-themes/gnome-icon-theme-symbolic
+
+	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
+	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() {
+	# Change favorites defaults, bug #479918
+	epatch "${FILESDIR}/${PN}-defaults.patch"
+
+	# Fix automagic gnome-bluetooth dep, bug #398145
+	epatch "${FILESDIR}/${PN}-3.12-bluetooth-flag.patch"
+
+	# Fix silent bluetooth linking failure with ld.gold, bug #503952
+	# https://bugzilla.gnome.org/show_bug.cgi?id=726435
+	epatch "${FILESDIR}/${PN}-3.10.4-bluetooth-gold.patch"
+
+	epatch_user
+
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Do not error out on warnings
+	gnome2_src_configure \
+		--enable-browser-plugin \
+		--enable-man \
+		$(use_enable !openrc-force systemd) \
+		$(use_with bluetooth) \
+		$(use_enable networkmanager) \
+		BROWSER_PLUGIN_DIR="${EPREFIX}"/usr/$(get_libdir)/nsbrowser/plugins
+}
+
+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
+	# Required for gnome-shell on hardened/PaX #457146 and #457194
+	# PaX EMUTRAMP need to be on
+	if has_version '>=dev-libs/libffi-3.0.13[pax_kernel]'; then
+		pax-mark E "${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 switch to open-source"
+		ewarn "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[llvm]"; then
+		elog "llvmpipe is used as fallback when no 3D acceleration"
+		elog "is available. You will need to enable llvm USE for"
+		elog "media-libs/mesa."
+	fi
+
+	if ! systemd_is_booted; then
+		ewarn "${PN} needs Systemd to be *running* for working"
+		ewarn "properly. Please follow this guide to migrate:"
+		ewarn "http://wiki.gentoo.org/wiki/Systemd"
+	fi
+
+	if use openrc-force; then
+		ewarn "You are enabling 'openrc-force' USE flag to skip systemd requirement,"
+		ewarn "this can lead to unexpected problems and is not supported neither by"
+		ewarn "upstream neither by Gnome Gentoo maintainers. If you suffer any problem,"
+		ewarn "you will need to disable this USE flag system wide and retest before"
+		ewarn "opening any bug report."
+	fi
+}