Version bump, includes patches from 3.8.3-r2 and a few additional bugfixes. Drop old.

Package-Manager: portage-2.2.0_alpha191/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

4 files changed, 37 insertions, 74 deletions

diff --git a/gnome-base/gnome-shell/ChangeLog b/gnome-base/gnome-shell/ChangeLog
index 3d4c7d0984c5..0e2e91083281 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.43 2013/07/29 20:24:45 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-shell/ChangeLog,v 1.44 2013/07/31 03:35:45 tetromino Exp $
+
+*gnome-shell-3.8.4 (31 Jul 2013)
+
+  31 Jul 2013; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -gnome-shell-3.8.3-r1.ebuild, +gnome-shell-3.8.4.ebuild,
+  -files/gnome-shell-3.8.0-suspend.patch:
+  Version bump, includes patches from 3.8.3-r2 and a few additional bugfixes.
+  Drop old.
 
   29 Jul 2013; Pacho Ramos <pacho@gentoo.org> gnome-shell-3.8.3-r2.ebuild:
   Inherit systemd (#478670 by Alphat-PC)
diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest
index b51e3b8773fa..19c4430bdc35 100644
--- a/gnome-base/gnome-shell/Manifest
+++ b/gnome-base/gnome-shell/Manifest
@@ -5,21 +5,25 @@ AUX gnome-shell-3.5.x-bluetooth-flag.patch 1845 SHA256 c910495fe1bf93c6ab09252df
 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-r1.patch 7511 SHA256 85f848ba179aada5f28d4157a95c79ea7cb0af25beca4f1ea9e4ef311a77cd58 SHA512 43cf1866aecb4da20af10fa3a1d6dbec75957514ccc35d33b477410315fc23479ca7d38c74fa1804de9ad89df692810db88a4acd04058bc89acf9516ad693c56 WHIRLPOOL ebe811a59f85ebd8ffbd352114b8f34aee22a1041c46cd69b1578d6ed92d803e08bbd4c8938758607b5b8f2cfe0ed14a8c97f3a4e0427d40912be14499fb5b0d
-AUX gnome-shell-3.8.0-suspend.patch 2069 SHA256 5f313b9ece9e184b3559ee7b0df0c467adfab02749f499afc320c73b54b63a8a SHA512 5bc3cd0da743a78387423cc03902aa815429a540922b9caa5a749b99b966a135b46a7ccde5800987d1394db20d3234d360468b593ec02f4989175a12885cd513 WHIRLPOOL b91edd9ec9bd5f53c77193e6e344a654f6672a939196315a918d97d9e63903360ab067dbccf2b89c616c25215ef38c2472eca88df9235c99a97818d273a770f6
 AUX gnome-shell-3.8.3-networkmanager-flag.patch 7516 SHA256 eebb33213a2c028348557cdc0e1d8da1304c3844f551b2897975c85cb1b016f7 SHA512 daf4dca864d0aceedc2b8a5d4e0f958c7b56606952db90e97092a072cfc2313d9f88ddf25d25208fd167a5e2c0daea71d3b8a1f12d32fa7cec86aa4e6cc20ef2 WHIRLPOOL 755cdd491e78bb325b2bffd378ec3a2e0c0cd73fcc05edf20c2c24dde843e6ad22005159c8d66d94614f7637da09c2f37327a99dd54d9648b3a15e1a2f3daaf5
 AUX gnome-shell-3.8.3-relock-screen.patch 7530 SHA256 e2a0f02e9f3580935333552b56166f1afc2d573283d2cd5d0d6cf292392193a0 SHA512 897923003874752c6c4c2c16dc5b8a00aa4c2d18e2b07271eddf329e35530ed936003360c584263801684ce77414dc9fdcc91c2d0c14f43e115fa32ed68f82fc WHIRLPOOL d8c1bae3263b95f389bc03b657dc72d834f1bfe7df2792f47a77458feca293ccad7c0853773ffc825349aafa20081717cd75ae9ae6774a32526d0056c5e03fcb
 DIST gnome-shell-3.6.3.1.tar.xz 1408036 SHA256 4e0328d43ac443e7cc0c43bb67895112643952f14cd20fff1109c6cc5849d603 SHA512 62475d1c2da2d3716158ef896214ada3c03a0fb226cd76a550b542d5cd0ce97303316cecf6a1feea7729666de9f29c333a79a6f6822b29245a1d7535a6c4c6b8 WHIRLPOOL 21146084b74372fbee6ff6f1a4a4609c16601ea0a39331a684dcda57a74a965146ca9860e3a170160c720175111c0c0a0c49f3d3c960ee335a39775a4945704b
 DIST gnome-shell-3.8.3-patches.tar.xz 6520 SHA256 d197856e1ba4cf56f57f0c05b048ef8db4309cc83fa801fb9a7a49d92b1d1a43 SHA512 a5b592d8eb57de5c8b469e83546236830c70913806fc0439774e53e86da51d63a9dcdee7613295c81633ee4b8dd5ea7286de80ac85d846399ae4919344e12f33 WHIRLPOOL 4b9bce733852d1db23bb4b5af87166e858161e4ec1f08b41557ff8a83d767f82132c89924b7b494ffde377284e579bdbfb700e1f481bbea5d75ea1a719673892
 DIST gnome-shell-3.8.3.tar.xz 1513636 SHA256 145724f21ead9dbe0c39d3ab468b39264c7aaf3f0fa5d152b295d905d8339c22 SHA512 d95a7ce24073046ea196b1f299bef1a1f4581b3357da364162b7e1cc53d051e628625c0b74bcd835d60f77d39874c8e0f86e3f66c0205539179f64cbe983a16b WHIRLPOOL 9ed4566761115346f0db8e35b0da9f5409418e78176b5159a41541a6723e511bbdaa50b0808c387f8339651066452934732c5c384fabaa7a5427be8ab5e9ec9e
+DIST gnome-shell-3.8.4.tar.xz 1517048 SHA256 547e571c67b1436a32715b016ee63c666afcafed9c5a2f76dc4ad3bcaebffa47 SHA512 e35ccf9b4a52c98754ef80712f489f660e355b2694c41165ab4c398a53935f7cad6f7d2a5655d03557684e93fb684dfe817767a12017c227a143b77785b3b073 WHIRLPOOL 72c6c25d53226f6336e3c0c214cc85c4f18aaa76557bc3599d3a579aeff9b46edb05be451d2bbab5713f6b3f0eba7e5b9a4d627786d0d639a4799c803946d439
 EBUILD gnome-shell-3.6.3.1.ebuild 7138 SHA256 e8e1bf07cb3768a303714db4fd16b3ba59adc67624ee4b83de35a8b1a3d17f25 SHA512 600e3a5c38dfe9742d4d0540b8cc6a87fc5bf663d99cd76fcc160a0ce97f967e3d93fb750120e30abee8580c84c00cf8ba08190e9f856e34938afdb01ab3574b WHIRLPOOL 30c66e7a010818f69d0387c145041bdcc2354f44e83939796c9b3ace20e77b5e469838f055da342451baa24e940474f0aec4e74fce8e92434fbb98c0334de6c6
-EBUILD gnome-shell-3.8.3-r1.ebuild 7495 SHA256 273bb41e5e94b5c7d4aa60479f4e7ab7bd879a8a2c8dd8df81ead908f2ebe791 SHA512 7ba5100b00703cac02b8250475af9fff39ce26544b068ad35dc7e068fb02b899dc904bcb6eaadee917183f421ec5d74eb9dfa7c6b5a5be33d30cee8635a9dd35 WHIRLPOOL 92af13771f371a3c46512446490d3c7ac0ba94b98ab4233927dd554da86d8e07a18b5810e6ca68c515421962d4af1b7e2afbf8aa1c70407dcfdbdef9a3658b8b
 EBUILD gnome-shell-3.8.3-r2.ebuild 7771 SHA256 0c15f89e8597b7cf1a958b1ca51065ecff3bc9c3e4a32d72209819e95d6c559e SHA512 e6befe2a30d44087ef78e592c2ab704f974b0ae2893a6d283f387187f0ec908a5a8375da34c239d9f31bb61ada8e65f8fc48b02c0c31551bf82e8916442b50e1 WHIRLPOOL db279ed992d122c557306fd4c965be2c7d1993d3390a5d4757f9a59663d74e427f98c04e6596d31f18ba7ead1a6a03898ecfdc8e99a4cb30c12ba000fe1d624e
-MISC ChangeLog 10057 SHA256 5a00c82938486bafe3002b22bf466b7f88044e787a464cbad4d81faa41dad7e7 SHA512 fa4108aa24569a138da7ab00b0fd9949249e544754e92ab33aea25d0c07c292741a331e196e1d6e61a394b91424f0f54ed2f9bd387f5b0e9730cb934377d2b46 WHIRLPOOL fd008d99b16aed3618b4815032f16ab85711f5edc922392b2f6b8f4f28505e5ae7df2518f3b8faa4b6c81604f546fd239c1d0a6ad932c04566372f219ba35c2b
+EBUILD gnome-shell-3.8.4.ebuild 7613 SHA256 7acdad49b08540333fd2c6e476b1de7817d0b6c200f998a3af87b77e6e1675e0 SHA512 870907d4acfc9bb906141038f41ed9d9ef77b1574a635745a328c217fa1a813a9d07e66402b0e980c74b0090d8862f01673ea1dbc5b37e4b133b6d3a87262a5d WHIRLPOOL 1c081dec5be6ada20ce9958609f3726a9c2f90f78965b9364bbd686c94c4f84ed040671b8098da26e365150bcdb846a7c7240d3d912a848ae1598efbbcca7095
+MISC ChangeLog 10346 SHA256 cdf7df4fc74f0aa249de22e653347011d1d760b7f6571da182072f85d502d384 SHA512 1e21b4385a812f37a3e0ad2b489320dc3d13112799228b25a8decf1a2d2edbd3afafd97dbcebc4704ade13cf7449713bb3eda46ec99941fdbf9bf58f6783550a WHIRLPOOL efc79ed5774c0f1ba3106dc23b97f27cf6190d9f75d66292a1429f1115adf379f727886f85b5ae8216913b2debcac24cb8a7e939b6c1785181daa435782d45cd
 MISC metadata.xml 400 SHA256 23973e81d0dce0aa3c01a805dc6baa386c626c07015e8b0675b3402f7850b88f SHA512 5efbd89e333f41da839f6f18bdbbb236efd42642d57eb0317d448bbcd54fef36289125fc534d6bf1441eb852983c5dacda98712c4f1c6633b040305f1fc133f9 WHIRLPOOL a2e8a25716a103c6c123b4afd3393419ccc723c8f198cfa8dfa84666095ac231fac5253b4d5d0de9baff357f598edaa163605bb23673c7d72314585b7a5dceb3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlH2z5AACgkQCaWpQKGI+9SexACeNWitmWN62JTgqZsg0Dy7I4H+
-CSoAnihbHLDw48boGvz18tLWjufGGKDt
-=tJuF
+iQEcBAEBCAAGBQJR+IYVAAoJEJ0WA1zPCt1hCLgH/ifZ86Zw+s+BIoNVRAwDYDOg
+lM6yzeYBsK3ne8FYD2mcyNk2lbqi9W7qI/3o9aq6SQLMdvX0dVMkaBi2Sjv3AKym
+SK7Js2zaDS9TgD/QsqrEllS9ijBCw252/l7+ypwiX7RyJAQdLWqAOgnYYp0OCpcG
+jCG1PzH/5nHxX2/rZ3/A9emnxZ8t1dMeOpTzUGlbjQxjhR1gC2ofRzCOBESio69d
+K5unNibi3GcNO+oBiJQW4Ag3E2jsqjGvDOADII5EGKFznkSfIo+5QnIY/m8Mmeu4
+r6wnnqe/9VMlHMEpecYGSssh2Ol0ZPbhKWVnu64OY3/65KPciTVvLpmIVsmAchY=
+=qg41
 -----END PGP SIGNATURE-----
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
deleted file mode 100644
index 9f7f5229fe75..000000000000
--- a/gnome-base/gnome-shell/files/gnome-shell-3.8.0-suspend.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-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.3-r1.ebuild b/gnome-base/gnome-shell/gnome-shell-3.8.4.ebuild
index cc5255502819..849bb26bf94b 100644
--- a/gnome-base/gnome-shell/gnome-shell-3.8.3-r1.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-3.8.4.ebuild
@@ -1,13 +1,13 @@
 # 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.3-r1.ebuild,v 1.2 2013/06/14 18:57:27 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.8.4.ebuild,v 1.1 2013/07/31 03:35:45 tetromino Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 PYTHON_COMPAT=( python2_{6,7} )
 
-inherit autotools eutils gnome2 multilib pax-utils python-r1
+inherit autotools eutils gnome2 multilib pax-utils python-r1 systemd
 
 DESCRIPTION="Provides core UI functions for the GNOME 3 desktop"
 HOMEPAGE="http://live.gnome.org/GnomeShell"
@@ -15,7 +15,7 @@ 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"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
 
 # libXfixes-5.0 needed for pointer barriers
 # TODO: gstreamer support is currently automagical:
@@ -24,6 +24,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 # gnome-shell/gnome-control-center/mutter/gnome-settings-daemon better to be in sync for 3.8.3
 # https://mail.gnome.org/archives/gnome-announce-list/2013-June/msg00005.html
 COMMON_DEPEND="
+	app-crypt/libsecret
 	>=app-accessibility/at-spi2-atk-2.5.3
 	>=dev-libs/atk-2[introspection]
 	>=app-crypt/gcr-3.7.5[introspection]
@@ -33,7 +34,7 @@ COMMON_DEPEND="
 	>=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
+	>=dev-libs/libcroco-0.6.8: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
@@ -74,10 +75,11 @@ COMMON_DEPEND="
 # 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
+# 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]
 
@@ -92,12 +94,13 @@ RDEPEND="${COMMON_DEPEND}
 	>=gnome-base/gnome-settings-daemon-3.8.3
 	>=gnome-base/gnome-control-center-3.8.3[bluetooth(+)?]
 
+	>=sys-apps/systemd-31
+
 	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
@@ -124,9 +127,6 @@ src_prepare() {
 	# Make networkmanager optional, bug #398593
 	epatch "${FILESDIR}/${PN}-3.8.3-networkmanager-flag.patch"
 
-	# Revert suspend break, upstream bug #693162 (from Debian)
-	epatch "${FILESDIR}/${PN}-3.8.0-suspend.patch"
-
 	# Re-lock the screen if we're restarted from a previously crashed shell (from 'master')
 	epatch "${FILESDIR}/${PN}-3.8.3-relock-screen.patch"
 
@@ -209,4 +209,10 @@ pkg_postinst() {
 			ewarn "You will need to emerge media-libs/mesa with USE=classic."
 		fi
 	fi
+
+	if ! systemd_is_booted; then
+		ewarn "${PN} needs Systemd to be *running* for working"
+		ewarn "properly. Please follow the this guide to migrate:"
+		ewarn "http://wiki.gentoo.org/wiki/Systemd"
+	fi
 }