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

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

3 files changed, 16 insertions, 8 deletions

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:=