Version bump for Gnome 3.6. Switch to EAPI=5 and python-r1.eclass. Clean up old revisions.

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

10 files changed, 245 insertions, 443 deletions

diff --git a/gnome-base/gnome-shell/ChangeLog b/gnome-base/gnome-shell/ChangeLog
index 349965cbb897..b9147903d54d 100644
--- a/gnome-base/gnome-shell/ChangeLog
+++ b/gnome-base/gnome-shell/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for gnome-base/gnome-shell
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-shell/ChangeLog,v 1.18 2012/11/07 21:48:09 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-shell/ChangeLog,v 1.19 2012/12/26 22:47:32 eva Exp $
+
+*gnome-shell-3.6.2-r1 (26 Dec 2012)
+
+  26 Dec 2012; Gilles Dartiguelongue <eva@gentoo.org>
+  -files/gnome-shell-3.2.1-optional-networkmanager.patch,
+  -gnome-shell-3.2.2.1.ebuild,
+  -files/gnome-shell-3.4.0-libgnome-shell-js.so-link-1.patch,
+  -files/gnome-shell-3.4.0-libgnome-shell-js.so-link-2.patch,
+  -gnome-shell-3.4.1.ebuild, gnome-shell-3.4.2.ebuild,
+  +files/gnome-shell-3.5.x-bluetooth-flag.patch,
+  +files/gnome-shell-3.6.0-networkmanager-flag.patch,
+  +gnome-shell-3.6.2-r1.ebuild, metadata.xml:
+  Version bump for Gnome 3.6. Switch to EAPI=5 and python-r1.eclass. Clean up
+  old revisions.
 
   07 Nov 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
   gnome-shell-3.2.2.1.ebuild, gnome-shell-3.4.1.ebuild,
diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest
index 98fb7fc8d564..a687d2a34fca 100644
--- a/gnome-base/gnome-shell/Manifest
+++ b/gnome-base/gnome-shell/Manifest
@@ -2,27 +2,19 @@
 Hash: SHA256
 
 AUX gnome-shell-3.2.1-automagic-gnome-bluetooth.patch 1841 SHA256 df5f86858b8abc08225ffb7679e829250e05a419b439b2ecad0f02bd93b670b2 SHA512 43848dd5d04c3d3162d38f12c742d96b44061184ee946a502bf61952e17f11a57722163dcf59c1b78086c047dfc6d2c3046bd4c975fcf45ca565a2ed099802bd WHIRLPOOL 410f10e1bf87d90a33d193d726041e8cf5d66513a6ba31082bc57dbf9aefbb04c5ca3c1ba691ab60da99f2eb0319a3c55f2ecb205616779a113652fe838fc4b6
-AUX gnome-shell-3.2.1-optional-networkmanager.patch 7873 SHA256 c7b67f665b42d8a21e2a4f51bca121aba48af676d30e35eb6d6ac7939775b70b SHA512 172b4db94ff1c0428a20c9cbb3365a0e10a75e38a0d7e518cdf32358b3a057504aa493f2f580bde95654a9bbb62e593ca9e3f04f99f701e45e324bf5655c47e0 WHIRLPOOL 81e3dc209caf3f7f2f55bc2365dad58d80bd0e323f389dc3094b446634bacdb7976cd120c3994661a3fd98a0fe74edd4ce164b5b9eeba947f0c1663d93a7c261
-AUX gnome-shell-3.4.0-libgnome-shell-js.so-link-1.patch 1137 SHA256 ae1b5f47e29de890a9bec2bb425a29f66e965b5479a0dfe82a336149ef79bea7 SHA512 9fcc99afd442dd3d87053c62fe5f2095617f56679cb468999d904b294fea9db6d6b12e40e95f98f2b11fe223b8f879ed87db2ead08676ee9b80770af63a0f1f1 WHIRLPOOL 36148cffe751b84a9aca4b67ab45beae9b86df7fd3a8a62f723c1fbbfa6f3b8887bc2bd1451e1784f65839a4ec81908b17497ff3f6500b284de7842a1d62b73c
-AUX gnome-shell-3.4.0-libgnome-shell-js.so-link-2.patch 1238 SHA256 f5fd78df90bc3616765e5b9f04ab9aecc2436bdf124d23ea9d4498c483c0f3b3 SHA512 287f69546b0f6c280af797501c91277ce0696104a5d1438e0d574c206c3b4c000b13883ceb9a877293b4274fbe6e4230c6270e5a1277ffdeb5382392bfd456b3 WHIRLPOOL a22b8134f75d2e0c9edf9fbcb623bfaa3e85fa86a5b7c8695f29ba71b4b3fb6db7bb15a9bf81cb67cba5d1e122ce6ff8b9889d3d8695cf4142ba0515bee8a18a
 AUX gnome-shell-3.4.0-optional-networkmanager.patch 8532 SHA256 487bfd9772799cdd1969b252056af4934870de4704a0bea581876b966e9c754c SHA512 20c2bc1ec1dc93a00f7ce7862a90965da7ce055e37f1e54514bd8af9779f797075255f7a2e61e78f24aeca197cadc8ddf4ced1a58be51f36109654847928d5a7 WHIRLPOOL 59a98990664e3023171411b4250e2f774062a11064b647361318712275b3f50affc0321d8f9316623814c46a349c8fa356e4bdbcc90f9b5b757bc89b77ac2bb2
-DIST gnome-shell-3.2.2.1-patches-1.tar.xz 9244 SHA256 89c250adc8304a9d6f77e0a3af4136de8438f43b1e4874f2fc7966c7558c274a SHA512 18b1b2864c82330d596e7fe02962eaeac9c1da9afb9a7750263f0a4b139e867c8210f63ee53ba5bb68d3a469da888f7764eef158294e94925f1ea977fb2731c4 WHIRLPOOL a98ed8d3ef0b0fb613142cec7933d206e2f62fb63a472e56ce6f56717efb7e910317fbe00f424814cb0812c56bcfaf875a04d7d5b281c258b933edebff3bf36f
-DIST gnome-shell-3.2.2.1.tar.xz 1119984 SHA256 209363084ef2d58777d70d8430e4659b058cf854c4b9766f3019d69ffea34d6f SHA512 1ec27449c0f1c69086b6b34f8715d7c0e7ebac14c3060117459a9a529a28de972aaed064bfb2156fe21bfdeb4991951c43d5ea41e4737823a5ac30bb996da3c7 WHIRLPOOL 4d5a05beb3f5d9245b34398e84b2290b7d1833a10e62a0c252cf104a9dc1e2829e40a7ea7aeb0d1d405e811aece43c3e626f9091198ced758128c57b4a66328b
-DIST gnome-shell-3.4.1.tar.xz 1254596 SHA256 6abfd2fca104aae64ce9d027dd233fc218a58b861176a64831b68e3f90ab56a9 SHA512 5cb2061e1e694632feb4c9ca408fa210b4c82ff274b7f75d25c17ac8b5526e1611e02ea144dfad0e1f712bbeede2a25ae45db09780d563c67ddfc7a7d26de34e WHIRLPOOL 0afbea57f26ee0324b259bc569b5a79a73adf6cf7396ca0e2c2b1c1e00f53060fc51a225e3cb55ea77eaebc86a2f4c8a629c8c820e1f85110df1b0399e416b69
+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
 DIST gnome-shell-3.4.2.tar.xz 1257612 SHA256 3807f7882968d032f8f5c64b0e0af51c0d016f2e1c4fd1576203c9350e412720 SHA512 6d05c3c068e1a58aee1c96be88d9bf2332ff02f2b53b47bd405c94fa2345de528fcdddfbcd662eb30e50c96c6b8c70550fd72cee01547036845e7319e403a638 WHIRLPOOL 31010bc265f365a2e26a31eb36427b99443eb4efefc4d825a13857837b3fb1264b1776f17270861f686b600fe6edd53fe8dd108150e3b814631268a2a340e892
-EBUILD gnome-shell-3.2.2.1.ebuild 6723 SHA256 decb077b74c442176a84d04583cea7f9ae986eb2c811e9054dce4c15a0eaaae3 SHA512 3b4937e8d07a81cfac64c30f66414a3b105e38d9672932ab89d5423553a2ecc7f590c8abd8e14d8914c2f4208195de024412c37b732e8b5748a00bab300ab116 WHIRLPOOL 5e3df0b74b3c2b3ddc81c217e3940e8c64bcfb69231c203970545f0109a29defc009fdccdf84f7d3fe3ceb7f165f8f4373e892fec166681871528058edf5996a
-EBUILD gnome-shell-3.4.1.ebuild 6843 SHA256 59f3e3dacba7b9d6404fa47ee33f69878492dd04e45088d786a8fad039a69181 SHA512 587b45672bab6dfa9c08ef3e82b8618ec8552eb4d65b8581608b412a6f83a882b678f1ab569e9297c6cb93193b26e40e4e3ff3477f91eac9ed8eecae95449a76 WHIRLPOOL 9450cc94263a2a5880ba2aa118f6faa23a83329962bafa43db71f39066fe85916ee0766b09cca16de2f940282ad56ee3fd4aaf13338c54f898fe1591c1007317
-EBUILD gnome-shell-3.4.2.ebuild 7090 SHA256 c49b57656321c149c1859835ee05a0dc9f0b10621f1f8f3da62df0b67e657d38 SHA512 c57a7ee323a1f444c6a61a608164a712e0f4160d81753ce9f413a3d10546d256d7f79568ebcaa22c8060dd5350ae30f43bf89fc8129544beaff91ce24d67646a WHIRLPOOL eecd97d5ec18098568a1e937cb703769aee14924c9651c6d9ecbeaa050704d9630e96878527eb982af79ff21a8854f335150eb97c33aacca014be3e35dc89387
-MISC ChangeLog 5559 SHA256 207d98296183ee4f973ca014e97a489f1d1d6ea7c9730e1874baf375a4473d61 SHA512 f06ea0f5e82da14d6505e9710036efb7794aa66fdfbc098e85260b2354ccaa17fdc1fdd6390b68e0fb686f95fcdfea5992d871e3a0a85af1e688b1036dfcdaab WHIRLPOOL c63436db4fc0b0ae76f1a0e037c5dc79e7d700d07f5e9972418e0fa9fc44f1b9af07e0b5aa81a1e6e4891485078e9ff87cbcee4a96cf38928a4733159f1913c7
-MISC metadata.xml 297 SHA256 ac9d892e216a4337464b515b61b9fb3830f342e90c10764e6e06ba1dd5a56977 SHA512 ef7de189e22e9972588ce07f335d2b4f6e0cfbfb05d27ebc8d6caa3d90d3e1f905cecb2e64b2d5c72a15025d7f5921c036bb9a4e40a4de67e26c93a294fcc702 WHIRLPOOL e6cf1b6bda74c6e4e39776a13563720c7cf5a85a1d712a9d17bcf7da07e94bc02fffdaef7a1c56d6a0aeda335ed7dc23eddfb74c82ffb2a431a7315aacc0778d
+DIST gnome-shell-3.6.2.tar.xz 1396196 SHA256 86cff93ade1bf6a67ebd339c017d567c7dc849ff8b256a3803306f44c24b44f0 SHA512 5e03f12a2065bac698c232ae00ddcab2cccc5c88b1b6be586c4cb96a1c3fb10ab59258d4f8c47d2f299060ed485162c30a9dc1c511d4af51a4c49cda13f0fbca WHIRLPOOL 77ceb9a5f6e5ed6481eccf495f92dd3af7ce73550cc90f54bada055bac339f15edde02db58d59b2211ee7cd637f47484fe554f6845ad080e166d7d94ee92e5f7
+EBUILD gnome-shell-3.4.2.ebuild 7081 SHA256 2f12f1c54921216d41f40fb8a136f1b3575b81e706a4521576e3d003d4177778 SHA512 34266e5f77dd7d84f7089e5b62f82beefc1929246c66d457b549ab1a0c8c7f225e76d48d2270fe8390a5830cc0ea728b6c66bd2cd3e87f52f2f30054903fa739 WHIRLPOOL 142870bf412db7854c094fb3bf043abfb856555ebec56014a232285ee3366bd60628801111a4c42e6c5e9162a990a220c3c852c3963c9da117ea5ec80e086ca3
+EBUILD gnome-shell-3.6.2-r1.ebuild 6860 SHA256 357522990ee949e2ecf17bd8f2542600dc0a4e3e1f56217544f8049691cd91ab SHA512 66c3d3142bb9f4e3fc465a8d62cfce9c0728b55aaf286dc40eded029c8555b8d1746194c43331e2f8276829c7a23bffa2eb225d187c177f3057c77da40ead37c WHIRLPOOL 39e0d381309168f22a518b0a75a50b687b4b433b63c179685352cad0a6942f40f6a0999420ecd8506f3b50ee3b6bac3e1ec15a35d2bd6f7a12afc6db901671b4
+MISC ChangeLog 6157 SHA256 4e28b3797aed0034e385f6491872b7cb39a44bc2090a762128ab193bf66d38e0 SHA512 babe3a3de93b9d944648b7877fa375965c2ee284bb28a880a51c1d5ad3b98849089d32325f50844feee82c5fe2a93259de1ee8cb17f03e03a73df2b86c73c33f WHIRLPOOL ce81682d1c1e5e240fb0647e4cd9b68c344f4337aba3acac1e4acfd3f9fd9c8946b22a8caa4ff32b00faaca166ab113d7111437dd5a252421169c54dc763bab8
+MISC metadata.xml 400 SHA256 23973e81d0dce0aa3c01a805dc6baa386c626c07015e8b0675b3402f7850b88f SHA512 5efbd89e333f41da839f6f18bdbbb236efd42642d57eb0317d448bbcd54fef36289125fc534d6bf1441eb852983c5dacda98712c4f1c6633b040305f1fc133f9 WHIRLPOOL a2e8a25716a103c6c123b4afd3393419ccc723c8f198cfa8dfa84666095ac231fac5253b4d5d0de9baff357f598edaa163605bb23673c7d72314585b7a5dceb3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQmtcaAAoJEJ0WA1zPCt1hP9sH/0y0DCmP+392lVNIuWBut4ed
-bc3U5QnMlAez1ft2YScIS4HZ5BEkredKsqSRDtUOhGLSachFupLr/cOPbg+nnsY4
-R6e0c1rFyOItYhmp0ZlPnkGFd8B0BJc2KINzCSdSApS6JKxuaTKSiXHuCtYs3DBa
-nTyW2bWKPHEtjmRZ1mKuHljpXNgVpLxpwbg/r2179FX/JOUsMFV8FCujIEU1mtQj
-p5LOPgN5YEE4iOwuSfhXl25kAWO9upjoTFBhdtzMpqJpXameqL/ZSjxfrusul7pS
-tyWEwQqumCS/EZQKMG2DHFcmOP5V9lxM2A1ewteRsI/msHmtHUY45wspe3xhGNI=
-=jsck
+iEYEAREIAAYFAlDbfoUACgkQ1fmVwcYIWAaOYgCfdOluD/f37jRSkjxYvYUUnojM
+EvMAoIwPtrdKqI/UMyz6urMOCiM9vQvU
+=vdKc
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.4.0-libgnome-shell-js.so-link-1.patch b/gnome-base/gnome-shell/files/gnome-shell-3.4.0-libgnome-shell-js.so-link-1.patch
deleted file mode 100644
index 9f07884a351f..000000000000
--- a/gnome-base/gnome-shell/files/gnome-shell-3.4.0-libgnome-shell-js.so-link-1.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 73f565d27166420bbf4a7bb49a30ea5bf5d98566 Mon Sep 17 00:00:00 2001
-From: "Owen W. Taylor" <otaylor@fishsoup.net>
-Date: Wed, 4 Apr 2012 17:48:47 -0400
-Subject: [PATCH] Link the gnome-shell binary to libgnome-shell-js.so
-
-Depending on the exact linker options and versions, rpath's written
-into the binary may, or may not, be honored by dlopen(). Work around
-this by simply linking the gnome-shell binary to gnome-shell-js, since
-then dlopen() doesn't need to search paths.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=670477
----
- src/Makefile.am |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 95f1a41..7bafb6a 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -187,7 +187,7 @@ libgnome_shell_la_gir_sources = \
- gnome_shell_real_SOURCES =		\
- 	main.c
- gnome_shell_real_CPPFLAGS = $(gnome_shell_cflags)
--gnome_shell_real_LDADD = libgnome-shell.la $(libgnome_shell_la_LIBADD)
-+gnome_shell_real_LDADD = libgnome-shell.la libgnome-shell-js.la $(libgnome_shell_la_LIBADD)
- gnome_shell_real_DEPENDENCIES = libgnome-shell.la
- 
- EXTRA_DIST += test-gapplication.js
--- 
-1.7.9.3
\ No newline at end of file
diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.4.0-libgnome-shell-js.so-link-2.patch b/gnome-base/gnome-shell/files/gnome-shell-3.4.0-libgnome-shell-js.so-link-2.patch
deleted file mode 100644
index 718eb3055a88..000000000000
--- a/gnome-base/gnome-shell/files/gnome-shell-3.4.0-libgnome-shell-js.so-link-2.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 6fa762baaee77c9d1a8aacc758ab5c3c3c33df43 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Fri, 6 Apr 2012 14:00:48 -0400
-Subject: [PATCH] Prevent the link to libgnome-shell-js.so from being removed
-
-Add a dummy call to shell_js_add_extension_importer() to ensure that the
-link to libgnome-shell-js.so is not removed when using -Wl,--as-needed,
-which is the default on many distros.
----
- src/main.c |   13 +++++++++++++
- 1 files changed, 13 insertions(+), 0 deletions(-)
-
-diff --git a/src/main.c b/src/main.c
-index bac9524..c11c8d7 100644
---- a/src/main.c
-+++ b/src/main.c
-@@ -24,6 +24,7 @@
- #include "shell-a11y.h"
- #include "shell-global.h"
- #include "shell-global-private.h"
-+#include "shell-js.h"
- #include "shell-perf-log.h"
- #include "st.h"
- 
-@@ -342,3 +343,15 @@ main (int argc, char **argv)
- 
-   return ecode;
- }
-+
-+/* HACK:
-+   Add a dummy function that calls into libgnome-shell-js.so to ensure it's
-+   linked to /usr/bin/gnome-shell even when linking with --as-needed.
-+   This function is never actually called.
-+   https://bugzilla.gnome.org/show_bug.cgi?id=670477
-+*/
-+
-+void _shell_link_to_shell_js(void) {
-+  shell_js_add_extension_importer (NULL, NULL, NULL, NULL);
-+}
-+
--- 
-1.7.8.5
-
diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.5.x-bluetooth-flag.patch b/gnome-base/gnome-shell/files/gnome-shell-3.5.x-bluetooth-flag.patch
new file mode 100644
index 000000000000..b5717548262e
--- /dev/null
+++ b/gnome-base/gnome-shell/files/gnome-shell-3.5.x-bluetooth-flag.patch
@@ -0,0 +1,44 @@
+From fbc509635dd60d548945636bb4f1cfec5dc7fb49 Mon Sep 17 00:00:00 2001
+From: root <admin@catmur.co.uk>
+Date: Sun, 8 Jan 2012 13:55:05 +0000
+Subject: [PATCH 1/2] Fix automagic gnome-bluetooth dependency
+
+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 files changed, 5 insertions(+), 0 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 7ab5c59..f3dbdcc 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -123,6 +123,8 @@ PKG_CHECK_MODULES(GVC, libpulse libpulse-mainloop-glib gobject-2.0)
+ PKG_CHECK_MODULES(DESKTOP_SCHEMAS, gsettings-desktop-schemas >= 3.5.4)
+ 
+ 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`
+@@ -135,6 +137,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 libedataserverui-3.0 >= $LIBEDATASERVERUI_MIN_VERSION gio-2.0)
+ AC_SUBST(CALENDAR_SERVER_CFLAGS)
+-- 
+1.7.8.6
+
diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.2.1-optional-networkmanager.patch b/gnome-base/gnome-shell/files/gnome-shell-3.6.0-networkmanager-flag.patch
index ba304c1839d1..c996cc00e4f7 100644
--- a/gnome-base/gnome-shell/files/gnome-shell-3.2.1-optional-networkmanager.patch
+++ b/gnome-base/gnome-shell/files/gnome-shell-3.6.0-networkmanager-flag.patch
@@ -1,4 +1,4 @@
-From df21e761fc02cf1269a7bbee073b8a129cba1dcd Mon Sep 17 00:00:00 2001
+From da0912a522f80a72db5b73504dc82941067880b2 Mon Sep 17 00:00:00 2001
 From: Michael Biebl <biebl@debian.org>
 Date: Thu, 22 Dec 2011 22:04:12 +0100
 Subject: [PATCH] Make NM optional
@@ -13,25 +13,27 @@ Subject: [PATCH] Make NM optional
     BIKESHED SHOULD BE BLUE, also because the upstream package name is
     NetworkManager, not Network_Manager. ]
 ---
- configure.ac         |   49 +++++++++++++++++++++++++++++++++++++++++++++++--
- js/misc/config.js.in |    2 ++
- js/ui/main.js        |    8 ++++++--
- js/ui/panel.js       |    3 ++-
- src/Makefile.am      |   18 +++++++++++++-----
- 5 files changed, 70 insertions(+), 10 deletions(-)
+ configure.ac         | 47 ++++++++++++++++++++++++++++++++++++++++++++++-
+ js/Makefile.am       |  1 +
+ js/misc/config.js.in |  2 ++
+ js/ui/panel.js       | 12 +++++++-----
+ js/ui/sessionMode.js |  7 ++++++-
+ src/Makefile.am      | 17 ++++++++++++-----
+ 6 files changed, 74 insertions(+), 12 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index d1bea62..b972127 100644
+index e6ac88c..3ff8777 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -95,8 +95,41 @@ PKG_CHECK_MODULES(GNOME_SHELL, gio-2.0 >= $GIO_MIN_VERSION
- 			       libcanberra
+@@ -96,10 +96,43 @@ PKG_CHECK_MODULES(GNOME_SHELL, gio-unix-2.0 >= $GIO_MIN_VERSION
                                 telepathy-glib >= $TELEPATHY_GLIB_MIN_VERSION
                                 telepathy-logger-0.2 >= $TELEPATHY_LOGGER_MIN_VERSION
--                               polkit-agent-1 >= $POLKIT_MIN_VERSION xfixes
--                               libnm-glib libnm-util gnome-keyring-1)
-+                               polkit-agent-1 >= $POLKIT_MIN_VERSION xfixes)
-+
+                                polkit-agent-1 >= $POLKIT_MIN_VERSION xfixes
+-                               libnm-glib libnm-util gnome-keyring-1
++                               gnome-keyring-1
+                                gcr-3 >= $GCR_MIN_VERSION
+                                gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION)
+ 
 +##########################
 +# Check for NetworkManager
 +##########################
@@ -65,10 +67,10 @@ index d1bea62..b972127 100644
 +
 +AM_CONDITIONAL(HAVE_NETWORKMANAGER, test "$have_networkmanager" = "yes")
 +
- 
  PKG_CHECK_MODULES(SHELL_PERF_HELPER, gtk+-3.0 gio-2.0)
  
-@@ -256,3 +289,15 @@ AC_CONFIG_FILES([
+ PKG_CHECK_MODULES(SHELL_HOTPLUG_SNIFFER, gio-2.0 gdk-pixbuf-2.0)
+@@ -260,3 +293,15 @@ AC_CONFIG_FILES([
    man/Makefile
  ])
  AC_OUTPUT
@@ -84,80 +86,94 @@ index d1bea62..b972127 100644
 +	Support for NetworkManager:             $have_networkmanager
 +	Support for GStreamer recording:        $build_recorder
 +"
+diff --git a/js/Makefile.am b/js/Makefile.am
+index a3e4917..4b00193 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 a35fe28..4a09df6 100644
+index 9769104..9c4795d 100644
 --- a/js/misc/config.js.in
 +++ b/js/misc/config.js.in
-@@ -8,5 +8,7 @@ const PACKAGE_VERSION = '@PACKAGE_VERSION@';
- const GJS_VERSION = '@GJS_VERSION@';
+@@ -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@;
- /* The system TLS CA list */
- const SHELL_SYSTEM_CA_FILE = '@SHELL_SYSTEM_CA_FILE@';
-diff --git a/js/ui/main.js b/js/ui/main.js
-index 4c97440..828911b 100644
---- a/js/ui/main.js
-+++ b/js/ui/main.js
-@@ -14,6 +14,7 @@ const St = imports.gi.St;
- 
- const AutomountManager = imports.ui.automountManager;
- const AutorunManager = imports.ui.autorunManager;
-+const Config = imports.misc.config;
- const CtrlAltTab = imports.ui.ctrlAltTab;
- const EndSessionDialog = imports.ui.endSessionDialog;
- const PolkitAuthenticationAgent = imports.ui.polkitAuthenticationAgent;
-@@ -27,7 +28,7 @@ const PlaceDisplay = imports.ui.placeDisplay;
- const RunDialog = imports.ui.runDialog;
- const Layout = imports.ui.layout;
- const LookingGlass = imports.ui.lookingGlass;
--const NetworkAgent = imports.ui.networkAgent;
-+const NetworkAgent = Config.HAVE_NETWORKMANAGER ? imports.ui.networkAgent : null;
- const NotificationDaemon = imports.ui.notificationDaemon;
- const WindowAttentionHandler = imports.ui.windowAttentionHandler;
- const Scripting = imports.ui.scripting;
-@@ -84,7 +85,10 @@ function _createUserSession() {
-     telepathyClient = new TelepathyClient.Client();
-     automountManager = new AutomountManager.AutomountManager();
-     autorunManager = new AutorunManager.AutorunManager();
--    networkAgent = new NetworkAgent.NetworkAgent();
-+    if (Config.HAVE_NETWORKMANAGER) {
-+        networkAgent = new NetworkAgent.NetworkAgent();
-+    }
-+
- }
- 
- function _createGDMSession() {
+ /* gettext package */
+ const GETTEXT_PACKAGE = '@GETTEXT_PACKAGE@';
+ /* locale dir */
 diff --git a/js/ui/panel.js b/js/ui/panel.js
-index 2f78db9..63e472c 100644
+index bcbaafb..40c6ff9 100644
 --- a/js/ui/panel.js
 +++ b/js/ui/panel.js
-@@ -40,7 +40,8 @@ if (Config.HAVE_BLUETOOTH)
-     STANDARD_STATUS_AREA_SHELL_IMPLEMENTATION['bluetooth'] = imports.ui.status.bluetooth.Indicator;
+@@ -910,11 +910,13 @@ if (Config.HAVE_BLUETOOTH)
+     PANEL_ITEM_IMPLEMENTATIONS['bluetooth'] =
+         imports.ui.status.bluetooth.Indicator;
  
- try {
--    STANDARD_STATUS_AREA_SHELL_IMPLEMENTATION['network'] = imports.ui.status.network.NMApplet;
-+    if (Config.HAVE_NETWORKMANAGER)
-+        STANDARD_STATUS_AREA_SHELL_IMPLEMENTATION['network'] = imports.ui.status.network.NMApplet;
- } catch(e) {
-     log('NMApplet is not supported. It is possible that your NetworkManager version is too old');
+-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 808109a..7ee6b1e 100644
+--- a/js/ui/sessionMode.js
++++ b/js/ui/sessionMode.js
+@@ -6,6 +6,8 @@ const Signals = imports.signals;
+ const Main = imports.ui.main;
+ const Params = imports.misc.params;
+ 
++const Config = imports.misc.config;
++
+ const DEFAULT_MODE = 'restrictive';
+ 
+ const _modes = {
+@@ -91,7 +93,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'],
 diff --git a/src/Makefile.am b/src/Makefile.am
-index 4f8a1da..ecf4d13 100644
+index a390691..552b640 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -108,9 +108,7 @@ shell_public_headers_h =		\
- 	shell-generic-container.h	\
- 	shell-gtk-embed.h		\
+@@ -115,9 +115,7 @@ shell_public_headers_h =		\
  	shell-global.h			\
+ 	shell-idle-monitor.h		\
+ 	shell-invert-lightness-effect.h	\
 -	shell-mobile-providers.h	\
  	shell-mount-operation.h		\
 -	shell-network-agent.h		\
  	shell-perf-log.h		\
- 	shell-slicer.h			\
- 	shell-stack.h			\
-@@ -122,6 +120,11 @@ shell_public_headers_h =		\
+ 	shell-screenshot.h		\
+ 	shell-screen-grabber.h		\
+@@ -131,6 +129,10 @@ shell_public_headers_h =		\
  	shell-wm.h			\
  	shell-xfixes-cursor.h
  
@@ -165,37 +181,36 @@ index 4f8a1da..ecf4d13 100644
 +shell_public_headers_h += shell-mobile-providers.h shell-network-agent.h
 +endif
 +
-+
- libgnome_shell_la_SOURCES =		\
- 	$(shell_built_sources)		\
- 	$(shell_public_headers_h)	\
-@@ -145,9 +148,7 @@ libgnome_shell_la_SOURCES =		\
- 	shell-generic-container.c	\
- 	shell-gtk-embed.c		\
- 	shell-global.c			\
+ shell_private_sources = \
+ 	gactionmuxer.h			\
+ 	gactionmuxer.c			\
+@@ -162,9 +164,7 @@ libgnome_shell_la_SOURCES =		\
+ 	shell-invert-lightness-effect.c	\
+ 	shell-keyring-prompt.h		\
+ 	shell-keyring-prompt.c		\
 -	shell-mobile-providers.c	\
  	shell-mount-operation.c		\
 -	shell-network-agent.c		\
  	shell-perf-log.c		\
  	shell-polkit-authentication-agent.h	\
  	shell-polkit-authentication-agent.c	\
-@@ -161,6 +162,10 @@ libgnome_shell_la_SOURCES =		\
- 	shell-wm.c			\
- 	shell-xfixes-cursor.c
+@@ -183,6 +183,10 @@ libgnome_shell_la_SOURCES =		\
+ 	shell-xfixes-cursor.c		\
+ 	$(NULL)
  
 +if HAVE_NETWORKMANAGER
 +libgnome_shell_la_SOURCES += shell-mobile-providers.c shell-network-agent.c
 +endif
 +
  libgnome_shell_la_gir_sources = \
- 	$(filter-out %-private.h $(shell_recorder_non_gir_sources), $(shell_public_headers_h) $(libgnome_shell_la_SOURCES))
+ 	$(filter-out %-private.h $(shell_private_sources), $(shell_public_headers_h) $(libgnome_shell_la_SOURCES))
  
-@@ -272,7 +277,10 @@ libgnome_shell_la_LIBADD =		\
+@@ -296,7 +300,10 @@ libgnome_shell_la_LIBADD =		\
  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 TelepathyLogger-0.2 Soup-2.4 GMenu-3.0 NetworkManager-1.0 NMClient-1.0 Folks-0.6
-+Shell_0_1_gir_INCLUDES = Clutter-1.0 ClutterX11-1.0 Meta-3.0 TelepathyGLib-0.12 TelepathyLogger-0.2 Soup-2.4 GMenu-3.0 Folks-0.6
+-Shell_0_1_gir_INCLUDES = Clutter-1.0 ClutterX11-1.0 Meta-3.0 TelepathyGLib-0.12 TelepathyLogger-0.2 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 TelepathyLogger-0.2 Soup-2.4 GMenu-3.0
 +if HAVE_NETWORKMANAGER
 +Shell_0_1_gir_INCLUDES += NetworkManager-1.0 NMClient-1.0
 +endif
@@ -203,5 +218,5 @@ index 4f8a1da..ecf4d13 100644
  Shell_0_1_gir_LIBS = libgnome-shell.la
  Shell_0_1_gir_FILES = $(libgnome_shell_la_gir_sources)
 -- 
-1.7.8.3
+1.7.12
 
diff --git a/gnome-base/gnome-shell/gnome-shell-3.2.2.1.ebuild b/gnome-base/gnome-shell/gnome-shell-3.2.2.1.ebuild
deleted file mode 100644
index 77102cc0dbdb..000000000000
--- a/gnome-base/gnome-shell/gnome-shell-3.2.2.1.ebuild
+++ /dev/null
@@ -1,194 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.2.2.1.ebuild,v 1.8 2012/11/07 21:48:09 tetromino Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_DEPEND="2:2.5"
-
-inherit autotools eutils gnome2 multilib pax-utils python
-
-DESCRIPTION="Provides core UI functions for the GNOME 3 desktop"
-HOMEPAGE="http://live.gnome.org/GnomeShell"
-
-SRC_URI="${SRC_URI}
-	http://dev.gentoo.org/~tetromino/distfiles/${PN}/${P}-patches-1.tar.xz"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-IUSE="+bluetooth +networkmanager"
-KEYWORDS="~amd64 ~x86"
-
-# gnome-desktop-2.91.2 is needed due to header changes, db82a33 in gnome-desktop
-# latest gsettings-desktop-schemas is needed due to commit 602fa1c6
-# latest g-c-c is needed due to https://bugs.gentoo.org/show_bug.cgi?id=360057
-# libXfixes-5.0 needed for pointer barriers
-COMMON_DEPEND=">=dev-libs/glib-2.25.9:2
-	>=dev-libs/gjs-1.29.18
-	>=dev-libs/gobject-introspection-0.10.1
-	x11-libs/gdk-pixbuf:2[introspection]
-	>=x11-libs/gtk+-3.0.0:3[introspection]
-	>=media-libs/clutter-1.7.5:1.0[introspection]
-	app-misc/ca-certificates
-	>=dev-libs/folks-0.5.2
-	>=dev-libs/json-glib-0.13.2
-	>=gnome-base/gnome-desktop-2.91.2:3
-	>=gnome-base/gsettings-desktop-schemas-2.91.91
-	>=gnome-extra/evolution-data-server-2.91.6
-	>=media-libs/gstreamer-0.10.16:0.10
-	>=media-libs/gst-plugins-base-0.10.16:0.10
-	>=net-im/telepathy-logger-0.2.4[introspection]
-	net-libs/libsoup:2.4[introspection]
-	>=net-libs/telepathy-glib-0.15.5[introspection]
-	>=sys-auth/polkit-0.100[introspection]
-	>=x11-wm/mutter-3.2.1[introspection]
-
-	dev-libs/dbus-glib
-	dev-libs/libxml2:2
-	x11-libs/pango[introspection]
-	>=dev-libs/libcroco-0.6.2:0.6
-
-	gnome-base/gconf:2[introspection]
-	>=gnome-base/gnome-menus-2.29.10:3[introspection]
-	gnome-base/librsvg
-	media-libs/libcanberra
-	media-sound/pulseaudio
-
-	>=x11-libs/startup-notification-0.11
-	x11-libs/libX11
-	>=x11-libs/libXfixes-5.0
-	x11-apps/mesa-progs
-
-	bluetooth? ( >=net-wireless/gnome-bluetooth-3.1.0[introspection] )
-	networkmanager? (
-		gnome-base/libgnome-keyring
-		>=net-misc/networkmanager-0.8.999[introspection] )"
-# Runtime-only deps are probably incomplete and approximate.
-# Each block:
-# 1. Pull in polkit-0.101 for pretty authorization dialogs
-# 2. Introspection stuff + dconf needed via imports.gi.*
-# 3. gnome-session is needed for gnome-session-quit
-# 4. Control shell settings
-# 5. accountsservice is needed for GdmUserManager (0.6.14 needed for fast
-#    user switching with gdm-3.1.x)
-# 6. caribou needed for on-screen keyboard
-# 7. xdg-utils needed for xdg-open, used by extension tool
-# 8. gnome-icon-theme-symbolic and dejavu font neeed for various icons & arrows
-# 9. mobile-broadband-provider-info, timezone-data for shell-mobile-providers.c
-RDEPEND="${COMMON_DEPEND}
-	>=sys-auth/polkit-0.101[introspection]
-
-	>=gnome-base/dconf-0.4.1
-	>=gnome-base/libgnomekbd-2.91.4[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
-
-	>=sys-apps/accountsservice-0.6.14[introspection]
-
-	>=app-accessibility/caribou-0.3
-
-	x11-misc/xdg-utils
-
-	media-fonts/dejavu
-	x11-themes/gnome-icon-theme-symbolic
-
-	networkmanager? (
-		net-misc/mobile-broadband-provider-info
-		sys-libs/timezone-data )"
-DEPEND="${COMMON_DEPEND}
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	>=dev-util/intltool-0.40
-	gnome-base/gnome-common
-	!!=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
-
-pkg_setup() {
-	DOCS="AUTHORS NEWS README"
-	# Don't error out on warnings
-	G2CONF="${G2CONF}
-		--enable-compile-warnings=maximum
-		--disable-schemas-compile
-		--disable-jhbuild-wrapper-script
-		$(use_with bluetooth)
-		$(use_enable networkmanager)
-		--with-ca-certificates=${EPREFIX}/etc/ssl/certs/ca-certificates.crt
-		BROWSER_PLUGIN_DIR=${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins"
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	# Useful patches from git master (not in gnome-3-2 branch yet)
-	epatch ../patch/*.patch
-
-	# Fix automagic gnome-bluetooth dep, bug #398145
-	epatch "${FILESDIR}/${PN}-3.2.1-automagic-gnome-bluetooth.patch"
-
-	# Make networkmanager optional, bug #398593
-	epatch "${FILESDIR}/${PN}-3.2.1-optional-networkmanager.patch"
-
-	eautoreconf
-	gnome2_src_prepare
-
-	# Drop G_DISABLE_DEPRECATED for sanity on glib upgrades; bug #384765
-	# Note: sed Makefile.in because it is generated from several Makefile.ams
-	sed -e 's/-DG_DISABLE_DEPRECATED//g' \
-		-i src/Makefile.in browser-plugin/Makefile.in || die "sed failed"
-}
-
-src_install() {
-	gnome2_src_install
-	python_convert_shebangs 2 "${ED}/usr/bin/gnome-shell-extension-tool"
-
-	# Required for gnome-shell on hardened/PaX, bug #398941
-	pax-mark mr "${ED}usr/bin/gnome-shell"
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	if ! has_version '>=media-libs/gst-plugins-good-0.10.23:0.10' || \
-	   ! has_version 'media-plugins/gst-plugins-vp8:0.10'; 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-0.10.23:0.10"
-		ewarn "and media-plugins/gst-plugins-vp8:0.10, 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]"; 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]"; 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/gnome-shell/gnome-shell-3.4.2.ebuild b/gnome-base/gnome-shell/gnome-shell-3.4.2.ebuild
index 2902999effa9..75e40b0be301 100644
--- a/gnome-base/gnome-shell/gnome-shell-3.4.2.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-3.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.4.2.ebuild,v 1.3 2012/11/07 21:48:09 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.4.2.ebuild,v 1.4 2012/12/26 22:47:32 eva Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -151,7 +151,7 @@ src_install() {
 		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
+	fi
 }
 
 pkg_postinst() {
diff --git a/gnome-base/gnome-shell/gnome-shell-3.4.1.ebuild b/gnome-base/gnome-shell/gnome-shell-3.6.2-r1.ebuild
index b4db99a86168..44901047ecfd 100644
--- a/gnome-base/gnome-shell/gnome-shell-3.4.1.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-3.6.2-r1.ebuild
@@ -1,50 +1,53 @@
 # Copyright 1999-2012 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.4.1.ebuild,v 1.5 2012/11/07 21:48:09 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.6.2-r1.ebuild,v 1.1 2012/12/26 22:47:32 eva Exp $
 
-EAPI="4"
+EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
-PYTHON_DEPEND="2:2.5"
+PYTHON_COMPAT=( python2_{6,7} )
 
-inherit autotools eutils gnome2 multilib pax-utils python
+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 +networkmanager systemd"
+IUSE="+bluetooth +i18n +networkmanager systemd"
 KEYWORDS="~amd64 ~x86"
 
-# gnome-desktop-2.91.2 is needed due to header changes, db82a33 in gnome-desktop
-# latest g-c-c is needed due to https://bugs.gentoo.org/show_bug.cgi?id=360057
 # libXfixes-5.0 needed for pointer barriers
-COMMON_DEPEND=">=app-crypt/gcr-3.3.90[introspection]
+# 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.31.6:2
-	>=dev-libs/gjs-1.31.22
+	>=dev-libs/gjs-1.33.2
 	>=dev-libs/gobject-introspection-0.10.1
 	>=x11-libs/gtk+-3.3.9:3[introspection]
-	>=media-libs/clutter-1.9.16:1.0[introspection]
-	>=dev-libs/folks-0.5.2
+	>=media-libs/clutter-1.11.11:1.0[introspection]
 	>=dev-libs/json-glib-0.13.2
 	>=dev-libs/libcroco-0.6.2:0.6
-	>=gnome-base/gnome-desktop-2.91.2:3
-	>=gnome-base/gsettings-desktop-schemas-2.91.91
+	>=gnome-base/gnome-desktop-3.5.1:3=[introspection]
+	>=gnome-base/gsettings-desktop-schemas-3.5.4
 	>=gnome-base/gnome-keyring-3.3.90
-	>=gnome-base/gnome-menus-2.29.10:3[introspection]
+	>=gnome-base/gnome-menus-3.5.3:3[introspection]
 	gnome-base/libgnome-keyring
-	>=gnome-extra/evolution-data-server-2.91.6
-	>=media-libs/gstreamer-0.10.16:0.10
-	>=media-libs/gst-plugins-base-0.10.16:0.10
+	>=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.17.5[introspection]
+	>=net-libs/telepathy-glib-0.19[introspection]
 	>=sys-auth/polkit-0.100[introspection]
 	>=x11-libs/libXfixes-5.0
-	>=x11-wm/mutter-3.4.1[introspection]
+	>=x11-wm/mutter-${PV}[introspection]
 	>=x11-libs/startup-notification-0.11
 
-	app-misc/ca-certificates
+	${PYTHON_DEPS}
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+
 	dev-libs/dbus-glib
 	dev-libs/libxml2:2
 	gnome-base/librsvg
@@ -57,43 +60,42 @@ COMMON_DEPEND=">=app-crypt/gcr-3.3.90[introspection]
 	x11-libs/pango[introspection]
 	x11-apps/mesa-progs
 
-	bluetooth? ( >=net-wireless/gnome-bluetooth-3.1.0[introspection] )
+	bluetooth? ( >=net-wireless/gnome-bluetooth-3.5[introspection] )
 	networkmanager? ( >=net-misc/networkmanager-0.8.999[introspection] )
 	systemd? ( >=sys-apps/systemd-31 )
 "
 # 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 + dconf needed via imports.gi.*
+# 2. Introspection stuff needed via imports.gi.*
 # 3. gnome-session is needed for gnome-session-quit
 # 4. Control shell settings
-# 5. accountsservice is needed for GdmUserManager (0.6.14 needed for fast
-#    user switching with gdm-3.1.x)
-# 6. caribou needed for on-screen keyboard
-# 7. xdg-utils needed for xdg-open, used by extension tool
-# 8. gnome-icon-theme-symbolic and dejavu font neeed for various icons & arrows
-# 9. mobile-broadband-provider-info, timezone-data for shell-mobile-providers.c
+# 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]
 
-	>=gnome-base/dconf-0.4.1
+	>=app-accessibility/caribou-0.3
+	>=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(+)?]
 
-	>=sys-apps/accountsservice-0.6.14[introspection]
-
-	>=app-accessibility/caribou-0.3
-
 	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 )
@@ -101,66 +103,62 @@ RDEPEND="${COMMON_DEPEND}
 	!systemd? ( sys-auth/consolekit )
 "
 DEPEND="${COMMON_DEPEND}
-	>=sys-devel/gettext-0.17
+	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
 
-pkg_setup() {
-	DOCS="AUTHORS NEWS README"
-	# Don't error out on warnings
-	G2CONF="${G2CONF}
-		--enable-compile-warnings=maximum
-		--disable-schemas-compile
-		--disable-jhbuild-wrapper-script
-		$(use_with bluetooth)
-		$(use_enable networkmanager)
-		$(use_with systemd)
-		--with-ca-certificates=${EPREFIX}/etc/ssl/certs/ca-certificates.crt
-		BROWSER_PLUGIN_DIR=${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins"
-	python_set_active_version 2
-	python_pkg_setup
-}
-
 src_prepare() {
 	# Fix automagic gnome-bluetooth dep, bug #398145
-	epatch "${FILESDIR}/${PN}-3.2.1-automagic-gnome-bluetooth.patch"
+	epatch "${FILESDIR}/${PN}-3.5.x-bluetooth-flag.patch"
 
 	# Make networkmanager optional, bug #398593
-	epatch "${FILESDIR}/${PN}-3.4.0-optional-networkmanager.patch"
-
-	# Force /usr/bin/gnome-shell to link to libgnome-shell-js; fixes extensions
-	# https://bugzilla.gnome.org/show_bug.cgi?id=670477
-	epatch "${FILESDIR}/${PN}-3.4.0-libgnome-shell-js.so-link"-{1,2}.patch
+	epatch "${FILESDIR}/${PN}-3.6.0-networkmanager-flag.patch"
 
 	eautoreconf
 	gnome2_src_prepare
+}
 
-	# Drop G_DISABLE_DEPRECATED for sanity on glib upgrades; bug #384765
-	# Note: sed Makefile.in because it is generated from several Makefile.ams
-	sed -e 's/-DG_DISABLE_DEPRECATED//g' \
-		-i src/Makefile.in browser-plugin/Makefile.in || die "sed failed"
+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)
+		$(use_with systemd)
+		BROWSER_PLUGIN_DIR=${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins"
+	gnome2_src_configure
 }
 
 src_install() {
 	gnome2_src_install
-	python_convert_shebangs 2 "${ED}/usr/bin/gnome-shell-extension-tool"
+	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
-	pax-mark mr "${ED}usr/bin/gnome-shell"
+	# 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-0.10.23:0.10' || \
-	   ! has_version 'media-plugins/gst-plugins-vp8:0.10'; then
+	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-0.10.23:0.10"
-		ewarn "and media-plugins/gst-plugins-vp8:0.10, or use dconf-editor to change"
+		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
 
@@ -176,7 +174,9 @@ pkg_postinst() {
 		ewarn "fallback mode, or switch to open-source drivers."
 	fi
 
-	if has_version "media-libs/mesa[video_cards_radeon]"; then
+	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'."
@@ -185,7 +185,9 @@ pkg_postinst() {
 		fi
 	fi
 
-	if has_version "media-libs/mesa[video_cards_intel]"; then
+	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'."
diff --git a/gnome-base/gnome-shell/metadata.xml b/gnome-base/gnome-shell/metadata.xml
index ce772740cdd1..ad30ffa25276 100644
--- a/gnome-base/gnome-shell/metadata.xml
+++ b/gnome-base/gnome-shell/metadata.xml
@@ -3,6 +3,8 @@
 <pkgmetadata>
 <herd>gnome</herd>
 <use>
+	<flag name="i18n">Enable support for enhanced input methods through
+		<pkg>app-i18n/ibus</pkg></flag>
 	<flag name="systemd">Use <pkg>sys-apps/systemd</pkg> instead of
 		<pkg>sys-auth/consolekit</pkg> for session tracking</flag>
 </use>