Allow falling back to sys-power/upower-pm-utils.

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

14 files changed, 71 insertions, 39 deletions

diff --git a/gnome-base/gnome-control-center/ChangeLog b/gnome-base/gnome-control-center/ChangeLog
index e71f9a4d3509..e1c6b9bb9622 100644
--- a/gnome-base/gnome-control-center/ChangeLog
+++ b/gnome-base/gnome-control-center/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-base/gnome-control-center
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/ChangeLog,v 1.152 2014/05/31 10:21:05 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/ChangeLog,v 1.153 2014/05/31 22:35:34 ssuominen Exp $
+
+  31 May 2014; Samuli Suominen <ssuominen@gentoo.org>
+  gnome-control-center-3.10.3.ebuild:
+  Allow falling back to sys-power/upower-pm-utils.
 
   31 May 2014; Pacho Ramos <pacho@gentoo.org>
   gnome-control-center-3.12.1.ebuild:
diff --git a/gnome-base/gnome-control-center/Manifest b/gnome-base/gnome-control-center/Manifest
index d669b1185c59..ad3805145802 100644
--- a/gnome-base/gnome-control-center/Manifest
+++ b/gnome-base/gnome-control-center/Manifest
@@ -14,14 +14,18 @@ DIST gnome-control-center-2.32.1.tar.bz2 2280217 SHA256 7c568b57358e5c08f4d8dd76
 DIST gnome-control-center-3.10.3.tar.xz 6821248 SHA256 059172d5e7f8b6c385bcc1b73f966375b92a8456dd5eba8d7f8b75907c3324a6 SHA512 0289b5cbe56aeb10f1f28ef9fd66fbe3f3b3f977a1b1a5e8cd5d9089a8d8cae088b0d1abc44ae5a6a461d0a511cbd28446da8371738dbe4147889f40ee37822e WHIRLPOOL 9c5e496d3064c3a66bbb9bb8ede9153199b0e67beec872a3d334b10ac095215354aada524efbe4ccf7d1e3e935ab23f1ec2308a2aa5e9686225a9c5b456ea01e
 DIST gnome-control-center-3.12.1.tar.xz 6866544 SHA256 5297d448eff0ec58f6c0ad9fbd1b94bed0a850496df0ee65571c0622b49c1582 SHA512 35b765fc11182b0f7eec6bc31934f51ccbf01dde9f2e7deed6c84ca9811bd0a00783d75bd3fab7004fe41cc29740b6d6e0a7f3c6391a482eefcab0129d0278fe WHIRLPOOL 294a2f81a1b225814fd895dc7b579f0dec9c360983d3d683b4ff5bd47dd9ac91a84088485f872a7ef95e05f021469da9eaf5d987bd537a062f9a1525c03c4b47
 EBUILD gnome-control-center-2.32.1-r1.ebuild 2823 SHA256 2dfa1f6402c7ab7f4539183e15448a234cb6f80e38310c50f222536291d4d4c1 SHA512 562dcadbf348f7e0a25796fa03b5a32786549537fa2213c6ac279b942269a0e8c62a7a977da54c6939d82e87460ee77422032b337dd1959e26403312d82cf081 WHIRLPOOL 099ea3c37bba16bbc94308961365123ccdc80e8b0ec291e3d50a2607ea59fb6b2ce2deba45d1e66be0c3cb99f86b9c0ad55d087c20f90ae7fd93fe8983c8a722
-EBUILD gnome-control-center-3.10.3.ebuild 5070 SHA256 efbbf8fa0666c0fbc27080113308508555931067e83073fee7f988c9a6b15d91 SHA512 af5e305dd6587664fcebcd1b84848115a38994cc981ba6b772f376c770244423e36313576ca1bdb31023a8539e4c64f042703eb648d890a17af0727496eda470 WHIRLPOOL f9969a60eb61d03f58be8783cc3670197025b43fdff5f7492edcd3ee298e3e4dba029063add2cbffdf164db78804a2ad5a4289cb4549c23f1fd418c09fcd261a
+EBUILD gnome-control-center-3.10.3.ebuild 5103 SHA256 809f53e61a16ad9f813172822f7797bb6825f000fdcc8f42bfc146d3996c3869 SHA512 0c2e882e3092d2dd9709231d4cdc421587118b67123a0e4862d65178b88e30f2ada8ab37045cad93847dd30dea86dca97ce069d06faf0c11f83e673c5ba9a7a8 WHIRLPOOL d05064ecac2ac843cd85ca9751006a783fa469089754d30ae0dcc94258acfbfc5f4ea81604ffb22690fd8bf76fa708eed4f50258aa9b63b51e08f0e203a5b454
 EBUILD gnome-control-center-3.12.1.ebuild 5012 SHA256 fb95aee6294bdf7ce1f73ce60487233f78995236bf62a49f501c7565003556a2 SHA512 6a5c44215bf48b84fdb3599768380877b0606b6ec73605858274b4e773c23aa198530867512843ad20c189c1bbb5a60a27968432d1cee8d4e7a08cf56633aa99 WHIRLPOOL b08136e3746f17616ed17177f3a9e10aeef50c6a301af9075f83014576baa952a88adada0cee47a02601834a7431aac1c0f4946c1a9676381d515e6ad98e4683
-MISC ChangeLog 69076 SHA256 821f9ba21d32a9ed991dd100bc44b6a285027f91754c5f2d917993057d8732e2 SHA512 662115214e3abe87561a2632cf5d0e69e36a1d96343092f6a90d8d22052d84c438e1f05d4c0755d5c64428482f037edaffc7d7a4146a4fd3798aa8de0af43266 WHIRLPOOL b3876fc17d13527bc372127c3dbad58985e39ee8773974cc99d03f0bddbfcaeacc77bf1e83819f63e1a05154443bdccc6898b06fa82957e789a17d46be05bb18
+MISC ChangeLog 69224 SHA256 85bbf5a9625d09f6ab58da446bb33108fd8c90003d708391b245269614be47f1 SHA512 fc0fa6e89ec8431644cd1c279fd41f9157a563cc2a3715bf3bc96ba016c503254b3fd46bdbdb7ca24823936e398a229b383f078fc6d23122a096b77065d36804 WHIRLPOOL eea538f4ef22008c0f9f317fe81c3878b6f7a8ee8346d5499cb2a51cf66b2d5fd2af7dd50cce83dfc8d5bc22d6b45ffab300da4bb1cb360f7a5902481c6e2e0f
 MISC metadata.xml 626 SHA256 c9a75efab859ae7807307d84c8c849b4b1c3874bfbb598934146295b5a3f4328 SHA512 be29f660669a454fa1d237dff0045fb574ca9919351e685bb15866a700995ee2de2c7379a60441d08830dfd1d5d5c43a74e731e2a2e92a13109959a42353a87f WHIRLPOOL 1b967098d536cffb46d6b1ae877fa131c7672eb17dd0f49d62dc97a8b6157efb6371664b63a71269aa951e3f59b68e6bce86d037204f4f43242b649081828fcb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlOJrRIACgkQCaWpQKGI+9Q5xACfT6TsGIu8oWlnjdftEeTWjE6a
-7+0An1Zme6Cxc4YsLmjWNSKBsHUjai6u
-=NzJm
+iQEcBAEBCAAGBQJTili7AAoJEEdUh39IaPFNOaIIAJIdYqUFPBF2cvMyPpRfUqGj
+233BEh9/DbKeQvmtqOTGSKZ417hSliDy98hiTMmn1qK+adM7e/cKaxBZ9jCwMkBn
+eVsQxA/UssUsM3A54/qLFKu22ebErGRz3KlbGopOlP7TZn6qDHgxr9E6QL8Od5YK
+NgfXFyXWvoCxyXXh/mtuW9vagpLARR2Mg7x6lB7kZHDclAHOuzdgbw83bsAmzZVq
+lpdxplQS1n7b6OorBSLd8XMifVI+fKu0Z7qwegeSpAA83LOZaa83AXawf6NcvjyC
+mveXHuScpzoFjmFqHviO2lQ3kV91Lg+/9cNFzTJlmM3SLW9mjPctkL4CCG9YsN4=
+=Hktf
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.10.3.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.10.3.ebuild
index ae415b795813..d4159cdb9832 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-3.10.3.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.10.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/gnome-control-center-3.10.3.ebuild,v 1.5 2014/05/01 02:40:13 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/gnome-control-center-3.10.3.ebuild,v 1.6 2014/05/31 22:35:34 ssuominen Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"
@@ -44,7 +44,7 @@ COMMON_DEPEND="
 	>=media-libs/libcanberra-0.13[gtk3]
 	>=media-sound/pulseaudio-2[glib]
 	>=sys-auth/polkit-0.97
-	>=sys-power/upower-0.9.1
+	|| ( >=sys-power/upower-0.9.1 sys-power/upower-pm-utils )
 	>=x11-libs/libnotify-0.7.3:0=
 
 	>=gnome-extra/nm-applet-0.9.7.995
diff --git a/gnome-base/gnome-session/ChangeLog b/gnome-base/gnome-session/ChangeLog
index 884fd60ab66d..1ec2e3ac78d6 100644
--- a/gnome-base/gnome-session/ChangeLog
+++ b/gnome-base/gnome-session/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-base/gnome-session
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/ChangeLog,v 1.335 2014/04/27 16:53:14 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/ChangeLog,v 1.336 2014/05/31 22:36:12 ssuominen Exp $
+
+  31 May 2014; Samuli Suominen <ssuominen@gentoo.org>
+  gnome-session-2.32.1-r3.ebuild, gnome-session-3.10.1.ebuild:
+  Allow falling back to sys-power/upower-pm-utils.
 
 *gnome-session-3.12.1 (27 Apr 2014)
 
diff --git a/gnome-base/gnome-session/Manifest b/gnome-base/gnome-session/Manifest
index fef1cf83aafc..37db7c0b1b1a 100644
--- a/gnome-base/gnome-session/Manifest
+++ b/gnome-base/gnome-session/Manifest
@@ -19,15 +19,19 @@ AUX gnome-session-3.8.4-presence-crash.patch 2036 SHA256 14e24caadd8ed2056b00b0b
 DIST gnome-session-2.32.1.tar.bz2 774842 SHA256 22d93ce433fcf9c7ce6b5f36dd81f64e692ea0e41faaa0f61159ddac28c3686a SHA512 5d688e971ff440d33c7fff86db7b11d06aa39e9f6b4654a54ef6f4b608fe39c24b13be04726c69dbca4600fa91dc21b2f12415499367ec6045212828674bed99 WHIRLPOOL e03c121c5c644975deae06590828ce84a66e583838fc7de28752026e6c798b6fa4eaa4d6cdfa4975930c7ead730568e051c4dc280e5c7c80ab2bd4e64ffe9ca0
 DIST gnome-session-3.10.1.tar.xz 767336 SHA256 f620704e07e6bbf49aa6c65897475a46f80f7ac5593606f2b6889c7cb4f6a9cc SHA512 a17fdd1943c118f025a740b22de1f5840a2f8a1a9fc7f8a2720deccf69097391c2d05e6115416c40c5530de60326f6bd729444dd7a3b2aeff115fe547ad94d8f WHIRLPOOL 12237e7bf0bcfb78a9435d9b71937849d1e07f86d111ed143fd0ee0598a0c198eccdf9ca62e1c3229ff1f00c0baded92a98516d712e0be8d3c1aae9586b3bfec
 DIST gnome-session-3.12.1.tar.xz 718380 SHA256 fa308771ac18bc5f77e5a5be3b2d93df1625168cb40167c1dfa898e9006e25d3 SHA512 ee435aa31e2971f4d7246c748cace17a67f5697cbf016084aea4c263b2b2c096590b50920bc70ab45fb11e1470558f9c5b8864a37ae838f4a306ddc49acc5f2b WHIRLPOOL 41677526ad3323c7177ae592525f64d969004c475e9f17bddfb285a4d117a7cfc188c0b378b33f242be9a5d522441868b55f6c0a4f5029eb1949d195fef26517
-EBUILD gnome-session-2.32.1-r3.ebuild 2972 SHA256 b67ca3d7c561adccea184b8a70e047a0009ead24da57d3a9d508a43f79289674 SHA512 c1ede08752fadb66a2d95f9b01a567170e72943ad71c6bbf23f12e1b70516e0b2de10a394b7811507e84b49164f303f715059b7d8972cfc2d6e66f76826c50f6 WHIRLPOOL 37a7fb42d6d44f76f7d23f7a3158589d9381e2c830e40e593a8b51b70ef00f590a7f7dae3ae0439e80e275a43bc607f47aca31ae2d69c113e7452901021e4379
-EBUILD gnome-session-3.10.1.ebuild 3465 SHA256 abc7ddc604c909e4ccd9af0742c9796672ecc0eb219610f1a2ab8d7cb0064960 SHA512 ca6e64566351acf88a589904fd2908a63c4012e8a0ce66b7a43d6986f56d92693a92df5297c43fa8ed9f2a0cffd3cc10a5d06ac3e85b72c71578a3ba4844586a WHIRLPOOL 8a34cf69367b2ca95591a3cb38f96e9d714d6b3209aee9e7f8648b64b5104197659dd8636fd2615b0edf2a72a07dfc80b3f842181077039b159c1043b4ba773f
+EBUILD gnome-session-2.32.1-r3.ebuild 3005 SHA256 599d1774aaf72873f060a71befca3acdcfd51de40fde61c2b514554d035bec29 SHA512 789dfa33968dfce41ac54437f88e4f806201c34a81b88e8cd40da61da84835c012bf065931ab69e15d61f96e5e1e5739d9345a5433edef1e2b6d000f8028b9c7 WHIRLPOOL d26774618a6e69d1c293ed87011da34d70cb1cab237c1c10f6c837fc0416c4abd60cd060c8a34a9cff107d090932d081171e91b27cd60c03cf4c3f03030bac8a
+EBUILD gnome-session-3.10.1.ebuild 3498 SHA256 b89db2991698e7a45177da5cbefabefdfcb8cf98e382c788bdd149d84f105755 SHA512 c3acade4ac685f92f2461c2954745e717c39ee69c2e233c1fde3581b442a6a18bda6700bfecc54f73de9e1d75b54125a33d80e1f5f9c98dcc8d964aeea037bfc WHIRLPOOL faccdc522c314b411c0f44b754803e0fa1c174a68a6e4d28df89a71f0a61f072ebdbb786002a92303ff869aa5d5fdd2f4d3a80adb4cec8c82a060fe53b73e4a9
 EBUILD gnome-session-3.12.1.ebuild 3441 SHA256 dd13e44ac5e17076b24b0ef509e9f9c07ed6589a470e48d6642c53861f333c54 SHA512 b1670357092e5cffe9e9fc91a6e1eed0815b8982785240cc3602cf844f3ac9cab8769c7ddc1f6932e0daf7afc1547b5fc5d73d1bd8ae6276831acd4559d1fd28 WHIRLPOOL 6187fbc7ad8522fa48ccb1d93a18faac6a9b61d361af4497820503d38ee915b44103478b757de77590569a80878b338e471aa79cdfa84d8877408f01357f39bc
-MISC ChangeLog 50553 SHA256 faffd7044baf8ec36e9165b6b11b8001f30da9ba8e8662410787cdfeef92e7e5 SHA512 f4e6735a243f309a2b83b02055a3911a7b83b764b15812d08f641438407be380a3f5d8ad8ce6d9a7f9f7bec5b8193c45d3efe060b476a34fa2f387775146d2f1 WHIRLPOOL c387fb310729e9a513009383f32de0a4fb9831ed6335b445c7466d712b3d1d50ab1e055c9bb86da03350b8e80cad068cd7af7a78f0005142c338f111dc868086
+MISC ChangeLog 50728 SHA256 f74c9759f59238b77eb99c0055e2cd803a0a91773a2a29333b0fc03f926f8662 SHA512 04e959bb46b0466b5376248ed9d4d07ffe3fd8c6c018ae52e090e27517f2eb0151d6a6a0bd6d6895db3a3bc7b023707243ece64e95d4e9273749ca45a0ca419c WHIRLPOOL e71b841e1bc26e4fcf395f21461c37ea1f9d2f4ea529533fcba0a39370e9bf7f4d1953ece7cb40baa09c70ebfeaa7c71a03d5cbad860f7f18e35050cb7c1357a
 MISC metadata.xml 278 SHA256 4b6d5cc443e75f79675a992f133fdcf809fc528ca0e53bdbaf96a69383323c1d SHA512 32c59f5a0898ec7378ad33ac5a3f885f9b825633dfc0373603d413e8bf36b264c4efe03b8c0f4813237474ad858f929a74643869b7604c128e1ac5a5d1875b60 WHIRLPOOL 5552633b5518f886a89fa3a7b69ca5e8e7b81cc3436dc573e10990a4dea1e40ef14731a756501266449bbde0d9211145f9dccf3e3b728036645d6de1a6995295
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlNdNfsACgkQ1fmVwcYIWAakXACg0xURzJU4cddXImh6Ok0Kej4E
-VEQAoMCt7UA5fHjcFngZJQVmhjwwFHK0
-=VxjR
+iQEcBAEBCAAGBQJTiljhAAoJEEdUh39IaPFNkmgH/1egjxNu6/SrWtyil2FVqFwq
+cwJMiXiwbYZFT1VDu1fxQ3jySrD/TuyWAWAumUxK5yrjq2zESup9EyM9XFHLNuXP
+KC3RGd8pV7GqZh2f62tnz/aWhJBDZ1/ZOc2s7/3/jMfwyIXgjGvaAxuzsg/Igt7A
+PCRPbg3ST+xXXZG2SPtk/mQ+JWkKlk3YcQlQOiZ4PsTz4LwL2DX9Ti6qTLtVhhUl
+KNzBusS7gwZde6IIwuBAJVExXBdFhaNCp316GU01FDlwxA3WhLIrAbRs++fVAbgt
+RJyq87CAkZG2N3e43Lnwg/iHvWdHwA+i83KLCA7Nnngq58EfjBWOXv6K5CjfdTs=
+=VeXV
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-session/gnome-session-2.32.1-r3.ebuild b/gnome-base/gnome-session/gnome-session-2.32.1-r3.ebuild
index 05aadfbbfeff..3f7b188b44da 100644
--- a/gnome-base/gnome-session/gnome-session-2.32.1-r3.ebuild
+++ b/gnome-base/gnome-session/gnome-session-2.32.1-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/gnome-session-2.32.1-r3.ebuild,v 1.11 2013/01/22 05:40:33 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/gnome-session-2.32.1-r3.ebuild,v 1.12 2014/05/31 22:36:12 ssuominen Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
@@ -26,7 +26,7 @@ RDEPEND=">=dev-libs/glib-2.16:2
 	>=dev-libs/dbus-glib-0.76
 	>=gnome-base/gconf-2:2[gtk(+)]
 	<gnome-base/gconf-3.2.6
-	>=sys-power/upower-0.9.0
+	|| ( >=sys-power/upower-0.9.0 sys-power/upower-pm-utils )
 	elibc_FreeBSD? ( dev-libs/libexecinfo )
 
 	x11-libs/libSM
diff --git a/gnome-base/gnome-session/gnome-session-3.10.1.ebuild b/gnome-base/gnome-session/gnome-session-3.10.1.ebuild
index 490664c3fe31..e1e7761771e9 100644
--- a/gnome-base/gnome-session/gnome-session-3.10.1.ebuild
+++ b/gnome-base/gnome-session/gnome-session-3.10.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/gnome-session-3.10.1.ebuild,v 1.6 2014/03/29 21:00:14 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/gnome-session-3.10.1.ebuild,v 1.7 2014/05/31 22:36:12 ssuominen Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"
@@ -26,7 +26,7 @@ COMMON_DEPEND="
 	>=dev-libs/json-glib-0.10
 	>=dev-libs/dbus-glib-0.76
 	>=gnome-base/gnome-desktop-3.9.91:3=
-	>=sys-power/upower-0.9.0
+	|| ( >=sys-power/upower-0.9.0 sys-power/upower-pm-utils )
 	elibc_FreeBSD? ( dev-libs/libexecinfo )
 
 	virtual/opengl
diff --git a/gnome-base/gnome-settings-daemon/ChangeLog b/gnome-base/gnome-settings-daemon/ChangeLog
index 71150e22e2de..5567689acfb1 100644
--- a/gnome-base/gnome-settings-daemon/ChangeLog
+++ b/gnome-base/gnome-settings-daemon/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-base/gnome-settings-daemon
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/ChangeLog,v 1.139 2014/05/31 07:44:48 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/ChangeLog,v 1.140 2014/05/31 22:40:01 ssuominen Exp $
+
+  31 May 2014; Samuli Suominen <ssuominen@gentoo.org>
+  gnome-settings-daemon-3.10.2.ebuild:
+  Allow falling back to sys-power/upower-pm-utils.
 
 *gnome-settings-daemon-3.12.2 (31 May 2014)
 
diff --git a/gnome-base/gnome-settings-daemon/Manifest b/gnome-base/gnome-settings-daemon/Manifest
index a96dafb1246c..11206bd430e9 100644
--- a/gnome-base/gnome-settings-daemon/Manifest
+++ b/gnome-base/gnome-settings-daemon/Manifest
@@ -17,15 +17,19 @@ DIST gnome-settings-daemon-3.10.2.tar.xz 1648652 SHA256 808899c6e434ecb71f42d3ac
 DIST gnome-settings-daemon-3.12.1.tar.xz 1633548 SHA256 639df1fb978c765009d574d0fb892abbf35f1e875ba71e801cb0dd555a15f23c SHA512 496182d9e01e97f59465bc5b9b48881d4ec85aefd0d1c5018645d5524deb7fd01022efb32c3daa8cebaef12ecffb746ac1346072c3074949d6cde5f57cca00ae WHIRLPOOL 0ce1c17b90a6d1fd114d8ffc0948bc7817fb2e37bb3415d6b98faf0ee64820b6bd90d138e69bc7dc2d1134c821f94a59597fff24893a614922e7e12cf52ab500
 DIST gnome-settings-daemon-3.12.2.tar.xz 1672512 SHA256 e887bd63c733febccb7f2c1453c075016342e223214fa9cfc60d90f1e16e080f SHA512 d8063933ace4dfc9943991b5e6d29811546dec362cd3e26ec3c1c355ee2bbb854fb6fcc37ebaee78d70342ea2f6ae46325712dc6e20e6404ed54b0ee81c4bb8c WHIRLPOOL 977b689616645329dddeb515e0353927d901c8abf0f8033dd1fca245c77b71477249c5fd1abf82cb8ada25ec0d37a97eaf3af1f9d972f7d983d9e16aee4cd2c5
 EBUILD gnome-settings-daemon-2.32.1-r2.ebuild 3939 SHA256 f8ef87e63f2424cb2d9fced9bafa82fcd62079846c1e9562e27049eaa682d76d SHA512 946bcc938bd19a49cb060a034a0da4e26040c228f8987a6981a8c507ce63fe6b4aa889ecd0c12e5dc3b0fb3e2a106955bde4fbb0a9820ca2c325cf0793f1267b WHIRLPOOL 16062f23d482227a871eff39698659be325aa787606d1bdadcfff3444cb2730d42eb5d9d42a14eff7277da66b893518dd0956bdf2891b9deab0118548f0012b9
-EBUILD gnome-settings-daemon-3.10.2.ebuild 4189 SHA256 fd76ac79b47081700742b3a4ce416572b6e5388c5050cae0a1657d9d9d5a1115 SHA512 a27f8f949cfa7b22ab73bea8a646d6c1580c69a80429cb50642468740670e6c109ac08981867503d39622057ff59a24b5069de5e6e6601e1fcded759ef6f46eb WHIRLPOOL d40a19dca20852ce5783a274384ce0c56a53797841e2186e6c0930e37121eaee2501969a8dcfa4b3fe5b8a1357bf734ba70f381f53452672fe1a13a6c60c2ecc
+EBUILD gnome-settings-daemon-3.10.2.ebuild 4226 SHA256 9ebb3833a6e8684d8fbe8be2067f369e39c87efee28f92a90ba00caa0d616db7 SHA512 9a27356717235c6a00bbce13219ee9dfadd94bd9cde7e4e1f8558b91246cd1c499269f7fdf4097f69791bd11f01d4282915d80a97f7a3da6812a861061fb3342 WHIRLPOOL e3bddffb88d22e74b0dde4ed3253da5a38749e6d10197a2b2070a5d2fb85204db21999cd8591d07d4ba61f5b1411e1ecccaf287e94c88b3fe97d6d048bfe685f
 EBUILD gnome-settings-daemon-3.12.1.ebuild 4225 SHA256 ff8b506300f708a29fbcd1e2ef07c2f9a77c50a21e8f698e322e6204cda09923 SHA512 f7f51f890b7f532885b3fba59866638df9045ebfd47e2b2b32d96a932f27f13c53041d6d8225dfda25f6e304c2ff4931ef47850242d639543331748cfe432598 WHIRLPOOL aa2030218082cc623bce0fab4188eebba1d9d46cfb186e7e20acf8885227562ba6957dc8d89ae68c15a80eb7b626a84010a9d23ac53bf4b63dd771c404622e71
 EBUILD gnome-settings-daemon-3.12.2.ebuild 4317 SHA256 93b7d69b9696da0ddd051abedc2a521dad621a18c102fd6ca3a3ac3aad07153d SHA512 b682d4c75d9287c2fb13c01d6535f705f055cb55699754b3dd1df7153da533479d0d96a2a09d93cd643ffd6b2826d6a19c295ecb304845c96006af5df5e0359d WHIRLPOOL e12902b47f5a86d67fea98f5b7d9c73879f24d8c10ecffd61330a9db47b0b189ec48f39edbc4564adfa0d900f4573a31b3cef42b52257b722f3780a519bef408
-MISC ChangeLog 28818 SHA256 6a56487a0809dd1c67829f259da0e096a465ff40aa929c06e14b1768b7acf9f0 SHA512 f43c8f8924c6822f9fdf4bd8686112d481e4d0924d796e04bb22ba63da5f3d4e5445c722d22311c5c4e30ed62a5bfbd425a9ca2e4975f55d828b7a5dac3ff97d WHIRLPOOL b24ac04e48cf65b5193ab25780a7c3ca1b29e159b7417a1336d27b8a76e4fe178a5b5ee8a08f80a4ea177c20d785ca81e9d2a8400207f3c5f117475552b4d371
+MISC ChangeLog 28967 SHA256 da15930726573f73e8dcca8e43ff9f0c3259d6e2f0c51315576a31a1d55ac945 SHA512 d5e104e25bd52a210c2886ae4748f4e916b233844db658d813e8667dcedb2be30593363f285bae739c75246dd7a622daf4b258db049e724b08c5449356504133 WHIRLPOOL ab76e20259ead1f4d5f1c3ab40df6dee241c8b1de949a59dbc151051199701eaacad958d0829e3ab66dd8f3cbfcbf69b331e4392ef3ee6c05cdcc9582f88a1ba
 MISC metadata.xml 845 SHA256 87b6e8c514c79aea8bdb954ca9f74f04b3306999182fa8ac411ff4e16826c45e SHA512 4356b3dec82fed1c90398069d4648d728de7931e18920fc6c09e9a6ba7225331d21ae240ff93d6d2e447d4c6e7caf86b770107451b2b39c79c4e7b301798b5bf WHIRLPOOL a6cf1dc73278bd537c4e0687256109740ba924967b16be1cdb03315fc4ede64aacfe58af18fc85cafa6c5c074c2be705ca5050d373db368242d13fe7f80b0202
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlOJiHEACgkQCaWpQKGI+9SjCACdF7ISC7eMH9UpGY7tifq+PQy5
-mA4AniNMc94M6uV6BtSoQmhT66Kqsizr
-=5iNE
+iQEcBAEBCAAGBQJTilnGAAoJEEdUh39IaPFNiZkH/A7SmUGmWggwKaxZSUmCZLmd
+wQ+ndrDw9CVQsoja6cDwXAJueB25IZ4GhF064d271hZ0ukbzYWydba+tLBun2vvp
+N0TMWuQsZVEKQAciXhreJM3di6C9KsrQMj1LK9ErHR92gHhUi2EAmYhHq/W+EnD+
+7SxuI/jg8wMRRS0nMWFio40Oy1/3Xm7uBFSGOQ6KVDYVKRzI1T/HvpkRKQh1EbRl
+89gILHHTIO8jX0RbI8oPCpCasU4fYPH/zoQif6GQ/6HVfsWZjKZiDEwylLr6omiv
+cHcjeqRleDGMLxHZaCtBih3XesCs3qWxFeh18m5JN2a/drq/iqop5PL0DQFZnng=
+=xoP+
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.10.2.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.10.2.ebuild
index 7b5dbdf7a93c..494179a2cb5c 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.10.2.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.10.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.10.2.ebuild,v 1.5 2014/03/09 11:58:52 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.10.2.ebuild,v 1.6 2014/05/31 22:40:01 ssuominen Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -31,7 +31,7 @@ COMMON_DEPEND="
 	>=media-libs/lcms-2.2:2
 	media-libs/libcanberra[gtk3]
 	>=media-sound/pulseaudio-2
-	>=sys-power/upower-0.9.11
+	|| ( >=sys-power/upower-0.9.11 sys-power/upower-pm-utils )
 	x11-libs/cairo
 	x11-libs/gdk-pixbuf:2
 	>=x11-libs/libnotify-0.7.3:=
diff --git a/gnome-base/gnome-shell/ChangeLog b/gnome-base/gnome-shell/ChangeLog
index dbec75a61f21..99712b1f2b8e 100644
--- a/gnome-base/gnome-shell/ChangeLog
+++ b/gnome-base/gnome-shell/ChangeLog
@@ -1,6 +1,10 @@
 # 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.79 2014/05/31 07:49:11 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-shell/ChangeLog,v 1.80 2014/05/31 22:37:15 ssuominen Exp $
+
+  31 May 2014; Samuli Suominen <ssuominen@gentoo.org>
+  gnome-shell-3.10.4-r1.ebuild, gnome-shell-3.10.4-r2.ebuild:
+  Allow falling back to sys-power/upower-pm-utils.
 
 *gnome-shell-3.12.2 (31 May 2014)
 
diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest
index 4fbf4ee65243..fe7d18aac769 100644
--- a/gnome-base/gnome-shell/Manifest
+++ b/gnome-base/gnome-shell/Manifest
@@ -15,16 +15,20 @@ AUX gnome-shell-defaults.patch 1266 SHA256 eeea87bd5f02b3da83435c69d44a57e85d0ad
 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
 DIST gnome-shell-3.12.2.tar.xz 1540872 SHA256 3ae230e8cb7a31e7b782c16ca178af5957858810788e26a6d630b69b3f85ce71 SHA512 21c6d121d04f631a801367a61822b625bfcbcef13dc99be61fa1972f44012cac06e74684447099e5e1e951e20702df5e3c031fb73f315f843bdbfc55fa8c1e0d WHIRLPOOL 8ca32b15dabc617ba8d61d82ed1357300613ae166aa91dfa427435de8cda07a281f0f085fb6dd12512928fabef82a47785f8fe57ea3cc87f2d49d4e85ec190fb
-EBUILD gnome-shell-3.10.4-r1.ebuild 7767 SHA256 67d49e78da6bb540a0500bcc77f7d4d680a4669aa187168fee78bb205fcfe738 SHA512 01d8a8407bac85e714120d8f126a9945281b4facedd02359422f62824538bb38977f0165c7cad6caa4d5099f714babb52e811d8c6cdadcc634917da9e13e8adf WHIRLPOOL 52c9868b0c7eb192990453222ce9ad9eeeb1244ea2c973fdfeb52795efc247ce115ce214a0f8bbcf1b5be27cae3baadaed5501b221dac137cb12920b3d1c7550
-EBUILD gnome-shell-3.10.4-r2.ebuild 8343 SHA256 e64afcd8cdaddafe076fbf0db2eca1388897463764f6118f8b7425ea0be7cea8 SHA512 dcbe3d876dca8a4bdd951bffe1f7bf42120c944f81a280c08f624c5688058ffbc4b3a944f45b487281776e13caccf2945c03ff12bbf03851aa89058d8eac51ec WHIRLPOOL 9271ba9a6fbda0de202a632d122797ffd567b1ee0f8f76d2a0f47c6babcd42235cf15693ca1476ba11be44a19d033d617c56adfb22fe9c7913573f653eca65f9
+EBUILD gnome-shell-3.10.4-r1.ebuild 7815 SHA256 cec8b8fe153360f7c25f3266091f5503c3f656c6005e07a168a9ce6af8770ad6 SHA512 6e8593556eef07cd20852683f8395f43d6065a58b28df3f0c8739ccb84321720658cad914990881ae4cd527963cd98ae00cbdb14e7bdd06d264381537acada81 WHIRLPOOL 4247a6a81c58a7a074a90b39f20071c99f9cedb5571d42dd26b79fe3f141e8eecd346eb40f7df87f9a3326a28bca42489dc025264ba5a91def4a44065d9dee97
+EBUILD gnome-shell-3.10.4-r2.ebuild 8391 SHA256 e7af0e9f6489eb8809e474842700a9619efc9bf5a468b8253fc86a2deffc4399 SHA512 d8169675b4df04c2f5fd7b9ccb72deb852338a18aa0812f91b5db57d12b85aa694263d6a1769f201927c3c0000b55c35df242719ca07036e8b621cbe0f4ff29d WHIRLPOOL b51c1575644d9a69b4c27ec3a7174f81b839de6f8b352a9c8022d1da637e5f8795cebfe215aeee62543014acaffc0aceeaa186de4c810a04a409c23b1bf5bb00
 EBUILD gnome-shell-3.12.1.ebuild 7548 SHA256 18b033e15fd4b60992ef8e2137889f1e3ed22236ad9f7d79948ba1d19bb2c8d7 SHA512 9b066c1dcd3b7d5d1d844328ebe928c8c686e5fe6bb3e6c7a46d037a22925a19907b818ff87e7664ca2d68c82b2b35d5717a1eccd9c6bbf10645dc64334ba438 WHIRLPOOL 95741f6f28695ceedac960eeeb029ba935928845502acd78b9becdbab545f7b1cb6a38adce0e68f9b103cce27e94993b4f79e84eefde20b1f55513e2d1d3f062
 EBUILD gnome-shell-3.12.2.ebuild 7544 SHA256 e7120146fd667262b5863283fbcbae65351de59ba7629ffc60c5dd2669bfde96 SHA512 fc4e6c4c83c1e8754cdf8ee9d30a4f61ed97ebe6c9a4548a3fc68bb9e698ad86d7b5a6ebf96a51c6edb5a368be670b88df5efa12476359d022528c282fae74a6 WHIRLPOOL 0407320a01707c5f06951d5e332871a2632e9233457937ee11eead302d8aed1d1b8649ada41a44e6cb4424b262cbdeccf9efb40a9783037bc115bf949c46a9ef
-MISC ChangeLog 17380 SHA256 35816f2fc5b0a610c483b4d7b0d7ea90ded302fc5239d6d716ec3bde2aed66b8 SHA512 e79f833542d8419b2e89db4e6db4e0a1e71d81b87cf3174f2a1fc581ce746ec9148b00029042936517a40a8c8a56917236cf0cb1047de19d2ac2f0f3e46ad3d5 WHIRLPOOL c5a9e86f6274b4b2ff3450c8423de6d6f834d858af4a383c259bc712393dff0fb81a2724327c41355090eee7029e1ca555152e526d43be4686e967e63b69d656
+MISC ChangeLog 17552 SHA256 891bf0f2b32f77f85ece258c825acca3695d61b637d71565255c4d0e094b89e5 SHA512 c2d46a4e7e1a9fcd30ffad73ddc15006a20fcdb327f2bc989c4c2fe1a73fb8b24bd8198e1583de512c0b7fa9e56d5f5d4cec78267ecbec58f21a2cf4cc3d81b0 WHIRLPOOL 6ab676f578c9cf6f8679f4f4d7dd4f7871e191aa7846ca3dd9b93c06407bf80dd3ed515e0bfa9c2fdf9b7a91114a55b9f9d5f15a16d5c320adffc9623d390c2a
 MISC metadata.xml 503 SHA256 3b98b49418c316196a011c8706d99612da0dccfc184a11c2b4e2af912190384e SHA512 0e4a7bcc41c9edcbf0882f24427ab29ab8631cb3fdeca8b68734a143987012a66b6383c97dff57c5afd33d93b5da913d0755e6a9607101987bf9413e58551235 WHIRLPOOL 3eec055b8a58e6af24a72a1a8f4a544766aec38fe2c237a26c63468f63e98a2d4c4bb77254bf1dd0498ecb070aefce65da1cbb3dd77cf26c34449d8fc1cc83df
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlOJiXgACgkQCaWpQKGI+9SF2gCfWGZobpCs5KxJ6SffOGaal7GY
-u5QAoIHiIVq7QPMpKPPXePOKZD55q1Qh
-=Tr1A
+iQEcBAEBCAAGBQJTilkgAAoJEEdUh39IaPFNDfgH/3VGHNXsYiD3edVsNUoNyGIR
+/cRGqr8jJyyWv0MJS7sNZEcpMymQtFQ1GoK1C9uQwtWsByipdSBaLBXlA39LTD7z
+aV7SislQWYniLalCgNzZLLO4AhinQzb1UrZFSCG/ZZMmES0MPctjmTsSK4wGN8Ak
+emA4Gd/JGSvHrd6eMOxyyef7iFP7FVwoStc4ALFdYPcA5GMgV1LGh+uQnzKIZQTb
+DOUefgh0q+CDK5ieDPJea+bef9uKOp/RITxD4So6qkR+7G+GHCc4+S0P1JW56CoN
+JedVn7tkTnczvRcgq5n/tAMZlfYFNc3pWdoE24KQcEdJ60mkxaKKHCPaZt5aO7I=
+=f6JI
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-shell/gnome-shell-3.10.4-r1.ebuild b/gnome-base/gnome-shell/gnome-shell-3.10.4-r1.ebuild
index a4c79c888895..af91fc4a6def 100644
--- a/gnome-base/gnome-shell/gnome-shell-3.10.4-r1.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-3.10.4-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.10.4-r1.ebuild,v 1.6 2014/05/08 01:11:26 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.10.4-r1.ebuild,v 1.7 2014/05/31 22:37:15 ssuominen Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -86,7 +86,7 @@ RDEPEND="${COMMON_DEPEND}
 	>=app-accessibility/caribou-0.4.8
 	media-libs/cogl[introspection]
 	>=sys-apps/accountsservice-0.6.14[introspection]
-	sys-power/upower[introspection]
+	|| ( sys-power/upower[introspection] sys-power/upower-pm-utils[introspection] )
 
 	>=gnome-base/gnome-session-2.91.91
 	>=gnome-base/gnome-settings-daemon-3.8.3
diff --git a/gnome-base/gnome-shell/gnome-shell-3.10.4-r2.ebuild b/gnome-base/gnome-shell/gnome-shell-3.10.4-r2.ebuild
index f3d642141dab..5665a2eaa6d0 100644
--- a/gnome-base/gnome-shell/gnome-shell-3.10.4-r2.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-3.10.4-r2.ebuild
@@ -1,6 +1,6 @@
 # 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.10.4-r2.ebuild,v 1.6 2014/05/08 01:11:26 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.10.4-r2.ebuild,v 1.7 2014/05/31 22:37:15 ssuominen Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -86,7 +86,7 @@ RDEPEND="${COMMON_DEPEND}
 	>=app-accessibility/caribou-0.4.8
 	media-libs/cogl[introspection]
 	>=sys-apps/accountsservice-0.6.14[introspection]
-	sys-power/upower[introspection]
+	|| ( sys-power/upower[introspection] sys-power/upower-pm-utils[introspection] )
 
 	>=gnome-base/gnome-session-2.91.91
 	>=gnome-base/gnome-settings-daemon-3.8.3