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

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

23 files changed, 113 insertions, 83 deletions

diff --git a/gnome-extra/cinnamon-control-center/ChangeLog b/gnome-extra/cinnamon-control-center/ChangeLog
index 58bf457743de..e51c90404a4a 100644
--- a/gnome-extra/cinnamon-control-center/ChangeLog
+++ b/gnome-extra/cinnamon-control-center/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-extra/cinnamon-control-center
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-control-center/ChangeLog,v 1.2 2014/05/16 01:54:47 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-control-center/ChangeLog,v 1.3 2014/05/31 22:33:33 ssuominen Exp $
+
+  31 May 2014; Samuli Suominen <ssuominen@gentoo.org>
+  cinnamon-control-center-2.2.5.ebuild, cinnamon-control-center-2.2.7.ebuild:
+  Allow falling back to sys-power/upower-pm-utils.
 
 *cinnamon-control-center-2.2.7 (16 May 2014)
 
@@ -15,4 +19,3 @@
   +files/cinnamon-control-center-2.2.5-nm-applet.patch,
   +files/cinnamon-control-center-2.2.5-optional.patch, +metadata.xml:
   Cinnamon-2.x has its own control center
-
diff --git a/gnome-extra/cinnamon-control-center/Manifest b/gnome-extra/cinnamon-control-center/Manifest
index f0f320d0731d..7235605f0acd 100644
--- a/gnome-extra/cinnamon-control-center/Manifest
+++ b/gnome-extra/cinnamon-control-center/Manifest
@@ -5,18 +5,18 @@ AUX cinnamon-control-center-2.2.5-nm-applet.patch 1366 SHA256 f19a142d93b2649e2d
 AUX cinnamon-control-center-2.2.5-optional.patch 3164 SHA256 409d944613f8e66cc413673239888d5fc8bb2e56f635909b14fd9f26d33474ba SHA512 587e93d79386f32ab122b329042e971eda6ba41a3bbf53ce300ba312701a817254cea1814ab777ded2689f29b974af02d07cf827ec5e801dcf47aab23664c5b1 WHIRLPOOL dcb1ab88b0b00e3d091d2b64778a9f37cfcf601dff6641d9aa8c3f365c10a694f3fc937d3cbea04285b9e07f716dee3f8e5ffb1af238e23d1d859769b23b49d9
 DIST cinnamon-control-center-2.2.5.tar.gz 4853804 SHA256 a1584d58eaba6a307debbaa94c1ddde1d46d4035d3c2905c7ed9c7a7ea83401d SHA512 3e39a4465aeedf7084ba75b085a95bf20f4fe7d759ddd1e18cf43270366bd09544a98b35843fd357af33519c5f939668edada2c35912abda80c6c267a99e1f3a WHIRLPOOL d6638214fd83a6ccbd68c2225baf714942a62ff0a85a3c75cc5aa4dca118f201668ec7224a0196d4a17ddcf0914d01bd8909e0ad84762c9f3b8975f899bbe075
 DIST cinnamon-control-center-2.2.7.tar.gz 4855169 SHA256 9585a9920e91561d7f4d7a85fe4d3321835d685ca6cbcb1e62c5c1b1d140dfbd SHA512 4dc0e90d6eea6ae759c4d358f1a6b8d0d16eaa7c2d9002d6b3b92aad321b1d4e720df368e9071db3e929bf84b59009f3d47ec9655494a77a76f6a19f1bb8750c WHIRLPOOL d693daf9369c831614ee136befb7e6928b8f9a538dcbf42ae3a918ebc6fb62241ceaa58b28280e7a8adb252ab3b16500a26550de34acab0e91595d8b741573f5
-EBUILD cinnamon-control-center-2.2.5.ebuild 2980 SHA256 f99e8a954647f7b3892c33103c4b392a0211d270c7c9dead0baa631856f7f3de SHA512 6efbc5adfb48e54cb9160a5947227f42d9285da431ad8eaaca3dd7fc22bfee72ba18a598f0dc7243723a716e492c9c832771346ab78744799f619f13c2d88cfc WHIRLPOOL a57a7a8422ac3e2861ced9b40abdc324a254f90ccfe906eb7e636b8634bc876b9eb754c2c4afa502b1c84457428e77a127985cfb93532bf0b94c43796430fb00
-EBUILD cinnamon-control-center-2.2.7.ebuild 2980 SHA256 b3798cd3e47300c3bc8ddc4566d641eb173bedfaf3873f6bf4271a9ae8592911 SHA512 91b01760055d742a7c99016371a1c4b45123925052d7622fca8b25120e769adf1ec36f9020f1f56c1566c1b23327a5d9eaf463e7565ed1f809be60f426171b25 WHIRLPOOL 68ff43b2626bb2ffd7ec79d559b461ad01af5c308f33f74d4bb1d802de14263827a8130204f1c212acd94b139f382786433c8571f33597bf1b083e396193d6c1
-MISC ChangeLog 742 SHA256 153a7544a33edf9642cc1c7b46e0901b9f508ffe12e3c81dac586081c04cb90c SHA512 68cdcd0ad108ab2cf010be0284570359aba112b7674ded55032a4b7ba4fa4314c0a64e03ad0356ab139eac1cd525dfd224730ca62228c5bdd13caeb4c883598a WHIRLPOOL f5c2e0ecb9c57e04e44e1b47e98483e1d267c3ddbf305dbceccb3208120ec15ae0e49f66f3f91e5713a45b658059b1e6f2000dea8f4b28190546c0b90c2e0aa4
+EBUILD cinnamon-control-center-2.2.5.ebuild 3013 SHA256 3c89ab5c08cfa4db7122d1f9c7ec117a914dfb134ba8141befcb6aac7fc42e8e SHA512 e0e2c5bbbdcbddbbdb144d570af465977e8c3df0d92ce3743bc5dba46a801eb3836da9ae1064161221dccdd25e52607fc6cd567afbf980ef81929dea7cd495bb WHIRLPOOL 849ba6f166c297455826a12994fe7382492196290435e9b6ee5e609c93849f62d296ca50c45b2dbd8c5f765630cb156a9c37b70c1018a6f0a34d52acb5cbbdfc
+EBUILD cinnamon-control-center-2.2.7.ebuild 3013 SHA256 c1fb9398778e290490a68ca8d291f95da7b8e03ef2c0dcf90adb25c6bc879bbe SHA512 ddabb3d7ec98a8f33d2d8851d3f5d70ddd45f795111232cbd9a163b47718a921722293653f29ffc96fef8533d6a67946e14a8b3e42458db44bd998ace48472a6 WHIRLPOOL a2df8c75d4edc684ec7290abe6c961595368a5cc7d7d0a708fb401c0c7eb3d67761f2b6c11ac705092bbe0b4c489d39d14f2666cc9dd8292e0e66dc7791f979b
+MISC ChangeLog 925 SHA256 7e82cff62cacb2bcb9f198f275914d43b0c50a9b06c61656308e2d9c03dc939f SHA512 7ad3c066831eb1d8db70088423ec52e824ad43e859b8f92b2759339c1e32a8be2b432223cae6159540e3e2d9188fa8f6b1aaf330bab89016ae6bbf02f59adb62 WHIRLPOOL 102096f29204f0e0d92b2e594da1b574867fe9024afbdcf938910d82b0bf17c9c7bf568d9dcf581722296b3aeef50fc33b58825e9ec5c873156e48f069bc0633
 MISC metadata.xml 392 SHA256 c000f51bfac9296d6a015c136e6a079d1e013cd68436589473205b9f6a352dc5 SHA512 059abffc02a5d0338acaeaf1e9874fd34aa455458c7cedcae37a5a2a6194851446755dac509f68554d47c2afb675e0934e95e57a2515724ed575df34f2e0d80a WHIRLPOOL f379cc0c4d84c9bc2d7135e1e7f83f43206971c1dba811d9abbafc429e0320dcc3e7f1333e56857eacae8b51529200d38e065ad9b898bac69727c921f2dd0366
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJTdW+wAAoJEJ0WA1zPCt1hGIUH/R9wf41PNkFU+lrfrhwZ79ZN
-5ulPqiKpmz6QkHmEmCfaGFp2Q9lca9hncnZFENgqAaReg1ZKr91ZYK/H1Ssckv9B
-lvZzuiuDeSEXTo/byaFn9jt4QAE9ZjFU9Qtr3UpImgAzdit8Elr1YvDZsi0LGust
-Hv28+Wthe0XUykYlmoSReeIKO72MxlkYDsuQ96D3xz1eSCWeaSvcanELju1qUbD4
-HGAEwohMfRoNWp75JBOb1ISWclFwXO8ic2E8pDii40W5WHNYlbwruTsU09xK3vpd
-sP1xm9GrXb0KnSr0trjJjZg8D1+P9b3uwHXXiosPIc4DKhrXbDjMMNgvne+RxNM=
-=zyw0
+iQEcBAEBCAAGBQJTilhBAAoJEEdUh39IaPFNIxwH/1ijIX809cx7tcQquxBnvCI2
+AbtPRPlu7Reis1YpYMAjV66ghf/0H82drjPUfSTn2MsWO+W4Xxsugu5s5N2Mjxw8
+kfmqRnXIEC6dNZ6C5qaY5FRjVOi0kMZzrA/nA3sn/u/Ma+ODJsUbUoeaG3w/LJi4
+N6TQ+vRUm9++JRLv836sEpGH04i97pIiu8Oe16EMzzVdGyG1w+ZA4GZK8qE8rBxU
+GNIc6XvGhbS4YUjnH709X+QlP0dOokaJuP4vuYTUc1i3OnfAK62XowurfFV8y0DH
+lFDHl+GB1TJyLNQZBB0eeKKH6dET0kh5J6urd7hWgygARDXj4vLioLTGZBhyj/w=
+=DUPR
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.2.5.ebuild b/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.2.5.ebuild
index 4d6e63ead0d3..c49dc2ba45cf 100644
--- a/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.2.5.ebuild
+++ b/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.2.5.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-extra/cinnamon-control-center/cinnamon-control-center-2.2.5.ebuild,v 1.1 2014/05/08 02:55:25 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.2.5.ebuild,v 1.2 2014/05/31 22:33:33 ssuominen Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"
@@ -37,7 +37,7 @@ COMMON_DEPEND="
 	net-misc/modemmanager
 	>=net-misc/networkmanager-0.8.9[modemmanager]
 	>=sys-auth/polkit-0.103
-	>=sys-power/upower-0.9.1
+	|| ( >=sys-power/upower-0.9.1 sys-power/upower-pm-utils )
 	>=x11-libs/gdk-pixbuf-2.23.0:2
 	>=x11-libs/gtk+-3.4.1:3
 	>=x11-libs/libnotify-0.7.3:0=
diff --git a/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.2.7.ebuild b/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.2.7.ebuild
index f653a10cb4dd..41e0d6e3dd0d 100644
--- a/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.2.7.ebuild
+++ b/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.2.7.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-extra/cinnamon-control-center/cinnamon-control-center-2.2.7.ebuild,v 1.1 2014/05/16 01:54:47 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.2.7.ebuild,v 1.2 2014/05/31 22:33:33 ssuominen Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"
@@ -37,7 +37,7 @@ COMMON_DEPEND="
 	net-misc/modemmanager
 	>=net-misc/networkmanager-0.8.9[modemmanager]
 	>=sys-auth/polkit-0.103
-	>=sys-power/upower-0.9.1
+	|| ( >=sys-power/upower-0.9.1 sys-power/upower-pm-utils )
 	>=x11-libs/gdk-pixbuf-2.23.0:2
 	>=x11-libs/gtk+-3.4.1:3
 	>=x11-libs/libnotify-0.7.3:0=
diff --git a/gnome-extra/cinnamon-session/ChangeLog b/gnome-extra/cinnamon-session/ChangeLog
index d04160b88d80..af39ac66f425 100644
--- a/gnome-extra/cinnamon-session/ChangeLog
+++ b/gnome-extra/cinnamon-session/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-extra/cinnamon-session
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-session/ChangeLog,v 1.3 2014/05/16 01:48:55 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-session/ChangeLog,v 1.4 2014/05/31 22:33:49 ssuominen Exp $
+
+  31 May 2014; Samuli Suominen <ssuominen@gentoo.org>
+  cinnamon-session-2.2.0.ebuild, cinnamon-session-2.2.1.ebuild:
+  Allow falling back to sys-power/upower-pm-utils.
 
 *cinnamon-session-2.2.1 (16 May 2014)
 
@@ -18,4 +22,3 @@
   +cinnamon-session-2.2.0.ebuild,
   +files/cinnamon-session-2.2.0-automagic-upower.patch, +metadata.xml:
   New package, needed for cinnamon-2.x
-
diff --git a/gnome-extra/cinnamon-session/Manifest b/gnome-extra/cinnamon-session/Manifest
index 8e38767b0b11..751de41c6fbc 100644
--- a/gnome-extra/cinnamon-session/Manifest
+++ b/gnome-extra/cinnamon-session/Manifest
@@ -4,18 +4,18 @@ Hash: SHA256
 AUX cinnamon-session-2.2.0-automagic-upower.patch 1141 SHA256 68fdc0ee0b1bf40b91ffd6d338f7e967a54f9750a3aa0c307fc5caa93211488a SHA512 c50cfb631c8ace4afe73ab486fddf2febb127c43e296c643b5aa167cd5a83bd5c266d317845e2c0d300827866729d3c0ec45c2f5091924fe8e77851e0844e288 WHIRLPOOL a190b78ebc95fc28c9f36b1b8a1fd268e69a913e1e80a040ce9b55f61645216327a4e939c9c85e53a76961e93d9075d0c867c6cd7af3912f0b87eb8623116385
 DIST cinnamon-session-2.2.0.tar.gz 900954 SHA256 b6ce4672a9b4fcd241c21a6b1921ff461e0c6e9fbeef4d4e9b1185785374ffae SHA512 2365b1af251cee09579fc7f8073ec3c26815cc5c6816f209bd6d45a8baa237ee33fedeff44c53f3b619f58649a441189aa890a64ff86e0c2277bde109bc12d49 WHIRLPOOL dea2f07d1f8ac97e87f4c07ab09072d4d6bcbd906c8a6c21aedc933361cd79ac251d62a3a958e275f86ba0b3ffda8340003e9a001b273448960de634138279e5
 DIST cinnamon-session-2.2.1.tar.gz 902111 SHA256 357c952e9f57072c03fce08d3fb59a345ab74a386858a4599eace29c4953cf8e SHA512 4cb7e061462287995b94e238e760f420d0c25a2fd0dfe3b9a6a4489174ea7288122b69b8b7c0d4ea3244bc83240d3a57826f8ab30144d2ff36460f59fb32432a WHIRLPOOL cf9c0229d213798dedf6638640c24d5f7e3fa9bffce5d0beb892725f803be6547c22416a75f37e10a8673a509525e041831bcf191c7f5d7244fc8080bf2a1293
-EBUILD cinnamon-session-2.2.0.ebuild 1742 SHA256 d4cb8b5483a9864b8e633c7de50507d4848a8a1726cd3a083662c827b2a25f98 SHA512 40f856c9172ce975cf9838b7d099af2951824687d9b4fdce276e5e1bba444b47452bb493218b2252a4b6e4504d886369b33411c4b5d68ae56627a055be7c8731 WHIRLPOOL fd6f638d7fa894a46e567f38101acacf07a0654ccd97c4176d9f14accfbf324d972b61b4d7d51f602f96c3b5bfa81b69b8ff780d143a06cb9d5f40d7c89c024b
-EBUILD cinnamon-session-2.2.1.ebuild 1742 SHA256 b1ee038e268a491e7ef46095a9ebca4be2a3c7d8ccd21d5bfe289e485c221052 SHA512 c3fbda2f3345718ac3749b6d1ad8177a9f7b6f080abbeb0a9bc5d7413e2890f60650f03320160f2c3c078bb0a0616eb31d5b13546d44bd14a71424df64bd468c WHIRLPOOL 80a904a2f137a3b3ab92b34f42b2b02f7f7f9f2feacbff6de6b3792f614de961ac5b3f45ba2a0676926828c0648a4778c4ce698c71dbfad708f2d83cd668fba3
-MISC ChangeLog 774 SHA256 4cd0b2bb5198066c2a381e53d2db5fc94a6e3bdb49d810e830fbddf4b3055f06 SHA512 4078815a6a212adc69915b1367310a95d9c285021105e6a38d31d26326aaafdad87c1c13976f215715d22c877cc3b94528991ff1634614ff0c99a012ec7783a6 WHIRLPOOL aabf8604f296bb0fe688d8e826d8f71145031866589c3f3e3be379ce582c270c028812c63dbb826010c2c6877dd61fbe74fcb51ca8462ef6f8a9115b3cf4b2ae
+EBUILD cinnamon-session-2.2.0.ebuild 1748 SHA256 861810b466f7703f4e3b58072f14f110d86ac14a4dabdbd33ef9cd6078dafac0 SHA512 f4a65473d956625c28545d35fe6caa4f5b6a713350dac8f95f09c94e2730befeaba03f921a8b673da66776201e5b1415a80a605253b9d62c35c977e40085113a WHIRLPOOL e6803a9e180fd9ce99d938372e6b4d6524a230d87335dc8f137e2c4e294f4cec7efc837c4ba1d37bca4c7eebed1f63690c5df072f3d40be1ab8847260a6850eb
+EBUILD cinnamon-session-2.2.1.ebuild 1748 SHA256 276d4c29cb5811566d8b265c985b71961d9b1eca69b0eb353d7520306776384a SHA512 3cd3e3523e4abd75cf70b8c3af26e7f80ddc7527f2b5e60de50d1414f5f37f2c97d154ab6a258d45d727370c750475f1c7cc84fcfe555d1281184cac5dda85e8 WHIRLPOOL 00ddf2ba402dfa62702394e7c530c27c7f4d9f7e6e637a1df9a71aea72450cc7089b392aba4cc693177e31c6833534f4c4fa0288f17d8c4687a9b6a58f2e525a
+MISC ChangeLog 943 SHA256 e831d29e11dab56c5e39da58def474c5ac6538f1c7f1b120a4cc8b7146879dcd SHA512 2d0dd84e5369164d59ea14a31a94e8d4f01ac03363cb9b30ec299047e9ae8d052d79ed011cff3fba9a0ceed80e5a08723b7a82b7deee296b168055c7895328e7 WHIRLPOOL 42e31db9f5f4881dc814f7c826f219415601fbab773f084a85bb29e91d15902bcf8786901b8d2d8b75589fce39f61fdad3357986c58c5535f2708676a8442ba0
 MISC metadata.xml 269 SHA256 4ef60693f0ad4a1afd7f0eb141960c38de3eba07901718525dccad91cbe0a17e SHA512 7b8752b8368299202d474604f040f20c085de81839b819af60bf94ed5b97b8e5211a9f8ff1a54e8fcd42580398a06ad4da277508a1000439cfb05b8bed4846d4 WHIRLPOOL dd447eec4894dde21d3d06fba1d0ee11c8fbe77eb0805d30c80a3079a9e46831d27066ad4ca7de8ed07da1f1727cf11016e713475e61a4a769b2cd5a3a602791
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJTdW5RAAoJEJ0WA1zPCt1h0IcH/imexl38pxk4prUs4obxasVz
-UfQaT4+ewkWmAFzeJt183whjPHdtSee0MY89H7Yr4i8NKpzRKy5ZUP/4myLwrHLs
-TBqsLIj7E1etA6a06ZuE3lUq3Rt8+tdt9hbaADwurJe1cSIsvEGd17TtfKgioTpk
-A4vU5pyMis8bvd7OvTpA27tuHIckCOnglecwW4uUi27mYnIJZbVjgKEdJFNh3X09
-1APOtt41otF8IhUi1rPk3JtN4SgViMJbxoiuHYqP3jeW6q/B1O9DoHh6IPBQ6tew
-RkDx78nSFbHrBlKVv5dtFrZv2NFXJBqaI4afpWVaBg9lYVRyKLgri62naK1aQP4=
-=EkCr
+iQEcBAEBCAAGBQJTilhRAAoJEEdUh39IaPFNXbsH/2KeGiq3axYo03xnU02jQgJf
+UJCFQkahfw+PMoUcCMk31s2cGvKc6XfmD9EROPa+49wxgb9AUv65yPdKMQOCLdYf
++X9aAi62cP30L7B7LjkqtF3dknWsBGJzQF1btV723gfhfXSQZzuSHdXJO/D41QTl
+KK0sRo4XrArv8LwjZzB8pdlX3oqDu5DnL1R6aoGPA1Kallav2UV4D4fCymYu8yHW
+wzThL4zliJnK4gCOUUTsDBXLtFZHQx7qU05WIep21mKbJRw1kI5R3Z+rER2IKaA5
+0+R37Gy0YLW5HkVQT2SuvewOVYc25UXWjArPSVsk4gEgoZ2K7JK+uCJd4Eexxww=
+=iB9u
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/cinnamon-session/cinnamon-session-2.2.0.ebuild b/gnome-extra/cinnamon-session/cinnamon-session-2.2.0.ebuild
index 8cd5699fb2a0..ac5a3d82a68d 100644
--- a/gnome-extra/cinnamon-session/cinnamon-session-2.2.0.ebuild
+++ b/gnome-extra/cinnamon-session/cinnamon-session-2.2.0.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-extra/cinnamon-session/cinnamon-session-2.2.0.ebuild,v 1.2 2014/05/13 00:51:10 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-session/cinnamon-session-2.2.0.ebuild,v 1.3 2014/05/31 22:33:49 ssuominen Exp $
 
 EAPI="5"
 
@@ -35,9 +35,7 @@ COMMON_DEPEND="
 	virtual/opengl
 	gconf? ( gnome-base/gconf:2 )
 	systemd? ( >=sys-apps/systemd-183 )
-	!systemd? (
-		>=sys-power/upower-0.9
-		<sys-power/upower-0.99 )
+	!systemd? ( || ( <sys-power/upower-0.99 sys-power/upower-pm-utils ) )
 "
 RDEPEND="${COMMON_DEPEND}
 	!systemd? ( sys-auth/consolekit )
diff --git a/gnome-extra/cinnamon-session/cinnamon-session-2.2.1.ebuild b/gnome-extra/cinnamon-session/cinnamon-session-2.2.1.ebuild
index f3496a88a21e..a930bfbe2413 100644
--- a/gnome-extra/cinnamon-session/cinnamon-session-2.2.1.ebuild
+++ b/gnome-extra/cinnamon-session/cinnamon-session-2.2.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-extra/cinnamon-session/cinnamon-session-2.2.1.ebuild,v 1.1 2014/05/16 01:48:55 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-session/cinnamon-session-2.2.1.ebuild,v 1.2 2014/05/31 22:33:49 ssuominen Exp $
 
 EAPI="5"
 
@@ -35,9 +35,7 @@ COMMON_DEPEND="
 	virtual/opengl
 	gconf? ( gnome-base/gconf:2 )
 	systemd? ( >=sys-apps/systemd-183 )
-	!systemd? (
-		>=sys-power/upower-0.9
-		<sys-power/upower-0.99 )
+	!systemd? ( || ( <sys-power/upower-0.99 sys-power/upower-pm-utils ) )
 "
 RDEPEND="${COMMON_DEPEND}
 	!systemd? ( sys-auth/consolekit )
diff --git a/gnome-extra/cinnamon-settings-daemon/ChangeLog b/gnome-extra/cinnamon-settings-daemon/ChangeLog
index bd5d05dd51f3..c4e91dff2e90 100644
--- a/gnome-extra/cinnamon-settings-daemon/ChangeLog
+++ b/gnome-extra/cinnamon-settings-daemon/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-extra/cinnamon-settings-daemon
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-settings-daemon/ChangeLog,v 1.3 2014/05/16 02:01:23 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-settings-daemon/ChangeLog,v 1.4 2014/05/31 22:27:58 ssuominen Exp $
+
+  31 May 2014; Samuli Suominen <ssuominen@gentoo.org>
+  cinnamon-settings-daemon-2.2.2-r1.ebuild,
+  cinnamon-settings-daemon-2.2.3.ebuild:
+  Allow falling back to sys-power/upower-pm-utils.
 
 *cinnamon-settings-daemon-2.2.3 (16 May 2014)
 
@@ -22,4 +27,3 @@
   +cinnamon-settings-daemon-2.2.2.ebuild,
   +files/cinnamon-settings-daemon-2.2.2-optional.patch, +metadata.xml:
   New package, used by cinnamon-2.x
-
diff --git a/gnome-extra/cinnamon-settings-daemon/Manifest b/gnome-extra/cinnamon-settings-daemon/Manifest
index eedac0160eb6..798f73f019f8 100644
--- a/gnome-extra/cinnamon-settings-daemon/Manifest
+++ b/gnome-extra/cinnamon-settings-daemon/Manifest
@@ -4,18 +4,18 @@ Hash: SHA256
 AUX cinnamon-settings-daemon-2.2.2-optional.patch 3058 SHA256 8d87f2ca35f5fd3d14e7ad926f87252cc528c33ab78677aeb60a7f9275503c03 SHA512 8f0899c587f8fefb892901ea460760b7391acd0c651e5fb9403ec30cee189e75a3b51ebce130fb836926121872ebcdaa5257fa51b107bc8f613f0d0cea60c71e WHIRLPOOL 89ec15936315963775a755706194d2d32d5a3151f0d16fcc8103cae9f373340f8e9676bb44537097c38e9ff2566df182b826d98244b39792469596c46bcf6ad4
 DIST cinnamon-settings-daemon-2.2.2.tar.gz 2994069 SHA256 4a7f7fdb1ce7d889634bf0f5f5a3391b4209400262037dae899fb5071d3fee61 SHA512 d280a75a6cee8bf9ee4a7bee21b2a0dd62bfa5dc7b601677424405a1667b542538145071d02615b38d8ec4a4f0ded06caabe979e894a20c2fe403f3c515e717f WHIRLPOOL 8554639d3d6d4558514c146e5cc091b9ec48bddaaac69315b9c23a7339b75d376c248b1afa6ba507667f4c5b81f829b8f9f085cfb40ae2d63a1abe471b92326c
 DIST cinnamon-settings-daemon-2.2.3.tar.gz 2994112 SHA256 c8776481e9b544662edb7c340805030d1331d70381c1a1b65db681f03e47be0e SHA512 25dc1b37274774b76d27858fed4ce2d641f2c240f67faad0c64609bfeae152e082c2223ad8e3f9c73914cfc42a61455423e3746c507ddf23b5a4d784eb43ccb8 WHIRLPOOL 734f75878de529160ff35681e80d7f5c4043171b0d4735acef686682300652432354943c81cc03d138328cb8ed1e979ad688101ddda816a0657961e3072c3fc6
-EBUILD cinnamon-settings-daemon-2.2.2-r1.ebuild 2149 SHA256 8f82a9e23712b433240e77e30c160d71c356dd0ffee8f7165a6230a7d6cb0add SHA512 4802e46765cb9cb2b72edb0ca10870fe0505ed775cbc6f5f7cbc5693fb917b6e004b45724c0a080f5b9c102f8d387a3ff7c446d90da95d354ed07c0ef3727938 WHIRLPOOL 536f832771a8b99b2aa530b4a04e6c3793486aa867dd6f85fe8699a62351cf8bade4673c86c544c85ed1af356b06fbd60e270c2129579c4b9bcd19fa2860ee61
-EBUILD cinnamon-settings-daemon-2.2.3.ebuild 2146 SHA256 a0a6346a03e0516f212d2d6f2ddbe13ed19c22bb655dab9b4e8437bc7d2bc1af SHA512 6d98ba84f7b7487d22fa405096ea2afe1250ac32288efe4fd1457b3089a81647cdc6cd8544d6bbaf5af62c9e72f2be5c9f0530498af0c60c4726b38b428ca1cc WHIRLPOOL a52457ab989c4ac3fa9cebc3865e6b5fc6063e4b9335e991336cf9bf1c83853699796e8b3271d0795d47d1f171f25abd6f12b37578d1bd9140b050970a6b28df
-MISC ChangeLog 1030 SHA256 67c7b6200d7aea238354f7097ad44f61756cbf95ac0fd4b56f58538820b6ff89 SHA512 45225a65219018910dc7e9aab8457fbc3ed764e2106504d0dfad26ca9f5ef2f2976f1a7e16cd47d263a31bdd184eb8462e2474f373f8ec37de8541e77d47d441 WHIRLPOOL 37091cdb4e8463114167814ff3abbb44bcd727aa05a1dd47ff7ca99e77198f36649dd23c4e7d623a4fc6c74ebc8bf177f88ad60af2da953a29e787695086b92e
+EBUILD cinnamon-settings-daemon-2.2.2-r1.ebuild 2182 SHA256 9867b0895a478045dc71de8afe57284c621af17326bbbf4dcb1f82d3c809d19c SHA512 0236efc205ddb167fd3145c48e450bd082c9b60d0edea85451e9acaf53d81d55bc894ae6d64595d1885c4dd500f310704d161d86fcc22bb70001e017664df087 WHIRLPOOL 4824b52d9f286653bf855193c45f36c882aca8a4676ea0ee4e23bda67cc110382264459655db424b61ea64c4b8ec493ca39ca809cb251ca972d68dbb02f784ec
+EBUILD cinnamon-settings-daemon-2.2.3.ebuild 2179 SHA256 950f7f13d3edf05ddbaa9ab0f6a655f34a9d55d889b0c0df7c10b7ecb43dc644 SHA512 3405fb118b80025f5f93c5818c1bf043c74558cdf85313581c487f3eb631d75d9c21019b489cbdaf0cb0f46aa7b8cf1efe03d2801e5f0a4468560fa0f855a7f8 WHIRLPOOL d8acbde704940a02ab508bcb112fe9865aec15ed50b45c971b50ba1110321e129edf73424fe224ad77b79f84eb0b5739022110544bc9e41b14b76f0e18106136
+MISC ChangeLog 1220 SHA256 2bcf50527716dead147f3c68cad46616af03d4ad4e5293eb15fbf6161561f0e7 SHA512 fd89a2c48bd60a5f07fadfcb2d11cd906a5bdb6d33daf61807533d7680357e63cf24a38f534dd2c9a747bd76855236e79df25efbd49ae2da9d31057af308d50c WHIRLPOOL 47c4a0479d4edd51d935e0dc6047b358faeb5f045337b8b3941b2d8b2bb9c25ca94fc755d606695a951afc868974f8877cf7616252c7aa3be20b0fc887506e3d
 MISC metadata.xml 257 SHA256 8d6f87c88d3da1d9a4e3f7c1bbfe1f5b6bdc74bf2a785531d8479dc74f92f3b7 SHA512 865f4729d377504a8848dee7aee28d33d99106d097608e7d4eb01f127922b4e48f072506963532c08b432d31192c074da3b2d7cde2d9182e3018fe6125a4f580 WHIRLPOOL 6b5d874e8edc033b2b738ab962ee87aaedfa57819cb194183ccece1729b17e8a829b89319c45f9cb0390de9fc67e5cf9b1000287bafc0769a5871967cb0634d3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJTdXE8AAoJEJ0WA1zPCt1hDikH/jrdEvf9zX1S0xegvbx1P7zq
-RXFsvUyyNh7Ux3hdQ8yY8mtDsLpjGZZHbpprnXCd8AvmoGmGgN/yLZ3bzfCuLZu4
-qa2P1vC/y1oEIV34rbQ67B6xiQ1QSnhX/WfFIhT52PkAE9HNWMBuf69DlvuoUdyU
-T6adVEiAPWpmOr96mJRLVziYoGynlb6aFaJWXVknj8L7VexKoa8s69TOSVtSk8w5
-siCGFHmKbzRXxdiagva+sGUHdfR9etb/Wxf/eLb8lpZr1i41TdhK+0UsVTP5vuwF
-/IisD1wxnKKkgOPw6zzA9PzyE/Uk4EgbMlXjUS3KyVA7G2+IqucFrFCAsd2B4Yo=
-=Ji20
+iQEcBAEBCAAGBQJTilbyAAoJEEdUh39IaPFNOmkH/i8SUDlaRmC8BZiaI4GxvgnW
+/eWADxf0BiBbUXgNqtDIuyNWF3V+xdo5YdkDAK6apJdSl+EnJA7Umw+dy9b83l5d
+s3jrRx7HkNLvM2SHTddj+P5UrmhqtI36WG56xfBV84V9J+Xf0yLbYTh4+KoLplLV
+eAjbPFhJj/B/ZsIuKlcTV102MOzgkBB5xnvt2UnjH5tUJwK/GN+CnznfUpklb2eD
+7JSf9J+5B69vkRulEgBCUSUREBfrqyLcH1lL0ufU1Yke80MLJHHfv1FibWDPv02k
+4y+mjPnQBpOIKNceJO6y7gBCvcKpmMHU28itm3HtNXB8R0jHZ8Xk78OvcfdTgDA=
+=fQhy
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.2.2-r1.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.2.2-r1.ebuild
index ee674418e7af..f3529f9260c5 100644
--- a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.2.2-r1.ebuild
+++ b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.2.2-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-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.2.2-r1.ebuild,v 1.1 2014/05/13 14:49:46 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.2.2-r1.ebuild,v 1.2 2014/05/31 22:27:58 ssuominen Exp $
 
 EAPI="5"
 GNOME2_LA_PUNT="yes"
@@ -28,7 +28,7 @@ RDEPEND="
 	>=media-sound/pulseaudio-0.9.16:0=
 	sys-apps/dbus
 	>=sys-auth/polkit-0.97
-	>=sys-power/upower-0.9.11
+	|| ( >=sys-power/upower-0.9.11 sys-power/upower-pm-utils )
 	x11-libs/gdk-pixbuf:2
 	>=x11-libs/gtk+-3.7.8:3
 	>=x11-libs/libnotify-0.7.3:0=
diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.2.3.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.2.3.ebuild
index 792f99235673..461a3a4a8f92 100644
--- a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.2.3.ebuild
+++ b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.2.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-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.2.3.ebuild,v 1.1 2014/05/16 02:01:23 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.2.3.ebuild,v 1.2 2014/05/31 22:27:58 ssuominen Exp $
 
 EAPI="5"
 GNOME2_LA_PUNT="yes"
@@ -28,7 +28,7 @@ RDEPEND="
 	>=media-sound/pulseaudio-0.9.16:0=
 	sys-apps/dbus
 	>=sys-auth/polkit-0.97
-	>=sys-power/upower-0.9.11
+	|| ( >=sys-power/upower-0.9.11 sys-power/upower-pm-utils )
 	x11-libs/gdk-pixbuf:2
 	>=x11-libs/gtk+-3.7.8:3
 	>=x11-libs/libnotify-0.7.3:0=
diff --git a/gnome-extra/cinnamon/ChangeLog b/gnome-extra/cinnamon/ChangeLog
index 0ca123ab1f30..365265d0d53c 100644
--- a/gnome-extra/cinnamon/ChangeLog
+++ b/gnome-extra/cinnamon/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-extra/cinnamon
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/ChangeLog,v 1.39 2014/05/25 13:54:50 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/ChangeLog,v 1.40 2014/05/31 22:30:15 ssuominen Exp $
+
+  31 May 2014; Samuli Suominen <ssuominen@gentoo.org>
+  cinnamon-1.8.8.1-r2.ebuild, cinnamon-2.2.9.ebuild:
+  Allow falling back to sys-power/upower-pm-utils.
 
   25 May 2014; Pacho Ramos <pacho@gentoo.org> -cinnamon-2.2.6.ebuild,
   cinnamon-2.2.9.ebuild:
diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest
index 050f201ba6a5..365b7aaf3616 100644
--- a/gnome-extra/cinnamon/Manifest
+++ b/gnome-extra/cinnamon/Manifest
@@ -18,14 +18,18 @@ AUX screensaver.patch 2218 SHA256 d931ca3ac5e5294a5a8afde9b861116d2b2688acaec7f3
 DIST cinnamon-1.8.8.1.tar.gz 4347516 SHA256 100cf6ca9b2622d74532323278bdefb06ac76b750bbf326cc9dadd14e99909bb SHA512 a709781b4e6cecfe97f6fb4bad4b953f6c11ec49ebacabbfcc186e57a2e6a28abebc163d7081248d6cbac24996732a4aea7e5d54991e6c09b9701b7e64a91a0f WHIRLPOOL 49533ec7c6c40aae5e76377a67efa88f16a7ae2a6b2c3b3ab9316cb61d40fbca544f00f402e2a75b54bd90537f0813dfb5ba4d3a17a2ad3ce5d7e67e88a6c543
 DIST cinnamon-2.2.9.tar.gz 2655818 SHA256 26b42a99a59d334b485565421a8eb52e8346ab908a0e235902f089d5f6efa8af SHA512 f0499232698bee548b83cd7482c7bfca3ea21328e68d84e19feef73bd8cf62627cff84ae1aa5fa76f0523d8a14b254b3029323415391eaf6d971cb0dc83b1beb WHIRLPOOL 5cca19150cb9a2fc9f7fcac521cbd81cc6b56cee01d74c7eaad2633494c512630463deb2e703ce55b5b01948ecafff8916a6da0443b5d761cc6047ce0d911402
 DIST gnome-3.8.patch 138356 SHA256 840cebcefc183076f9e9208421354e5e9cbccec62824c788b17cb564c2d2519a SHA512 1fd95720a6398607330ff445bd55f1f898dac03dda542d7a7246f81127e55793b02a4df4cc8c759a5f6c11dd7e5a6609bf0bfc05266a87e65034eab0f94077f2 WHIRLPOOL 84899979f7a4c1c6f7cb4f3d356e45e3b49f798605e48c768c3f43a90b828b3f1e9051e9e176bc099c9051d8fb4107e7d127cef27dc4797189b7c9479edf9bd5
-EBUILD cinnamon-1.8.8.1-r2.ebuild 8423 SHA256 7d74fbf78c227b4d63d28e708bc85363824e5714b3f9ada5489f25d5c9905f4e SHA512 761eab37565cb53f307c37460723c356fdb7760bb07dacdc8838e5569712c85070c25ffdf5c1b598ed1b631514ebd9fa666d7b7e44c341b5811610f7857396dc WHIRLPOOL 1913fc317f4210da88a260e31a7e16523a95b54e88ef7ee68f3823c5f14b3cc5375be8fb05534a6d624f7a3be9c1547815a4479e437c983a89778362c3fc428e
-EBUILD cinnamon-2.2.9.ebuild 7998 SHA256 fcaa925a3fd9ac2c4b17b029d419adacd7f5a923b114100b3d12791f7104a431 SHA512 c4d022aad090fdd243969bc9698ba5ef0e5e17b272209d46af2cbf7f094a8c29f0947ca1812b0476f93660bf525a8758016e4d4ea70efed1db88378b67c558c7 WHIRLPOOL f6330ea87b82804dbf616eff84a90ed50cdd6195fd89e1b4d84408b5f8cf9543e7ebdb62b60b5c964e4399dc0c33ea4250baf448819d311550c64130fc3f3ebf
-MISC ChangeLog 9228 SHA256 8671fd935a8990093ed4fc3cc91bfdef31decffdeb07d7aca5b5cebece54fe6c SHA512 7cb58425d22db47b71be77bdaf6f0c618235488ec01a08adf1a0cc8b94e841361f07ffb26902bb2530ba298194ba19adab742ff5d554e4040755347b4bc608f4 WHIRLPOOL 442950aa9727aeb7a34e56fef31add44fb7bfb4f3b78796fd4b358e0fdf9d40272d1f1746e041be1b56635339f81d53ede92a8de51b04b2c2713c950bb79b763
+EBUILD cinnamon-1.8.8.1-r2.ebuild 8475 SHA256 967dcbc3b65ce5fe50341880a2219ee7b8325fe5e76dca3befa466796e3abb7f SHA512 17f95440de95c8148dac0d8a372b262d171e60f537f0a375e13e42da4922853bf724cffd5c732e8849d0033608fbf9b8a83ff8f1580fe3e9d9d2b34767fbe655 WHIRLPOOL 8fac4523a7cc4f89848b361b6715ecc866496a30e2ff7b2d0de9b094845f5cf92a81100f81265c052e8d9457274ad22056fd6192863840de0239866335c5724c
+EBUILD cinnamon-2.2.9.ebuild 8050 SHA256 48afe1640f1103adda8b16c1efd0b4f012067911888b8c3af16ef7c8cdaa5f1a SHA512 507fda32587825abf5315c365d8c4759296e936750d01a3121e3375071146c8557381ea238a04d151179c1b821428561f188d67a35cf792bbf5c79609e6ea631 WHIRLPOOL 4fddfe245f1d77b26af3fa88251d019295d9973f897844c1d52442dd02032f28b3bde32a5ce5f4d063750da43b0bd129fe8b864f74230cd23a069da647317c92
+MISC ChangeLog 9391 SHA256 ae1f58194a6c2f57a457116d9aac8b0145e6c892f55afe02f0cafda22243083c SHA512 4db30e7392ca68afad82ed88ce89e6067c7e5ab2e46a06ee9bb449da760149901b50eae7a78db47fd18053f7641dfe494c8ac4c60d5b879546d35cb2c7786eb3 WHIRLPOOL b3039aac7ce3a08771de83dde0ca9923b4a985fd3938e3856c982b20e32cec862f96dcca3c5a05e64a62a4466214f9fa965f3199eb67103c00ceaeef08421b0c
 MISC metadata.xml 277 SHA256 6786a8b1c9403816c51e1d0148d688b84c4af397d5e9d1339c6b744145599b05 SHA512 57f61828a2c1bc24fa0ee0d83fac6e8aa1c6bf6baae9f291e649dac3a08bb8d49ab299f3b64a384f0dbb436ce210ac74cd1fc230079416d894ffb49717cd401a WHIRLPOOL f6d039a872e0b23097060a856262638e4d092dd407a0b332ce419216663b7d08269c8291fcf493300b4d55d0ac6f2cd8a771ed7bfcca2a329ffcba8f6ad4ab75
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlOB9isACgkQCaWpQKGI+9Rj6gCeNjt2mbi+yzAPMXgzYC1PeFX1
-4MoAmwYQMWGIKlkPfGJv2PU4rDMgdIZy
-=WW+6
+iQEcBAEBCAAGBQJTild7AAoJEEdUh39IaPFN1z0H/2RGoe/DLE7IyPrO1wcMz/Dd
+DyqEtczAX7vDFX7P5nLW21/YfvcahUkD9rXzljkbErhJLrAZPcWe5vw9NGD+AmxN
+QZU2FUYF6Tu2zCxi6pyswVPsaE3tlxKuw47WeQRDMcnqYETYl4BcRRHhZKze5Eqb
+hxJIm0NyMKfMqa8d5lOhAterOp8UbFJ/R/oYiB6LLFJ2jp27VmVSibJ9PkLfURRb
+YLQtiUHyTtIpCDh/Bi41yh2LSJkGM2SUC7yKDdidwfbaYKPqxEQJm0RJpr5OlFhU
+/FXfxMVBvtd/xAatFSrDUM9TNt+96LfeHasa3t8D2kG5mFl1H8RMQ3MiZoa+dhY=
+=3OM4
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/cinnamon/cinnamon-1.8.8.1-r2.ebuild b/gnome-extra/cinnamon/cinnamon-1.8.8.1-r2.ebuild
index f5517d57f165..e0caa81567a5 100644
--- a/gnome-extra/cinnamon/cinnamon-1.8.8.1-r2.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-1.8.8.1-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-extra/cinnamon/cinnamon-1.8.8.1-r2.ebuild,v 1.4 2014/04/26 08:23:05 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/cinnamon-1.8.8.1-r2.ebuild,v 1.5 2014/05/31 22:30:15 ssuominen Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -89,7 +89,7 @@ COMMON_DEPEND="
 RDEPEND="${COMMON_DEPEND}
 	>=gnome-base/dconf-0.4.1
 	>=gnome-base/libgnomekbd-2.91.4[introspection]
-	sys-power/upower[introspection]
+	|| ( sys-power/upower[introspection] sys-power/upower-pm-utils[introspection] )
 
 	>=gnome-base/gnome-session-3.8
 
diff --git a/gnome-extra/cinnamon/cinnamon-2.2.9.ebuild b/gnome-extra/cinnamon/cinnamon-2.2.9.ebuild
index 4ed31943b244..5f93a4379524 100644
--- a/gnome-extra/cinnamon/cinnamon-2.2.9.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-2.2.9.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-extra/cinnamon/cinnamon-2.2.9.ebuild,v 1.2 2014/05/25 13:54:50 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/cinnamon-2.2.9.ebuild,v 1.3 2014/05/31 22:30:15 ssuominen Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -79,7 +79,7 @@ COMMON_DEPEND="
 RDEPEND="${COMMON_DEPEND}
 	>=gnome-base/dconf-0.4.1
 	>=gnome-base/libgnomekbd-2.91.4[introspection]
-	sys-power/upower[introspection]
+	|| ( sys-power/upower[introspection] sys-power/upower-pm-utils[introspection] )
 
 	gnome-extra/cinnamon-session
 
diff --git a/gnome-extra/gnome-packagekit/ChangeLog b/gnome-extra/gnome-packagekit/ChangeLog
index b47f8499813f..fc309fe1c324 100644
--- a/gnome-extra/gnome-packagekit/ChangeLog
+++ b/gnome-extra/gnome-packagekit/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-extra/gnome-packagekit
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-packagekit/ChangeLog,v 1.18 2014/05/31 08:56:36 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-packagekit/ChangeLog,v 1.19 2014/05/31 22:26:19 ssuominen Exp $
+
+  31 May 2014; Samuli Suominen <ssuominen@gentoo.org>
+  gnome-packagekit-3.10.1.ebuild:
+  Allow falling back to sys-power/upower-pm-utils.
 
 *gnome-packagekit-3.12.2 (31 May 2014)
 
diff --git a/gnome-extra/gnome-packagekit/Manifest b/gnome-extra/gnome-packagekit/Manifest
index df0975606458..25110521aff3 100644
--- a/gnome-extra/gnome-packagekit/Manifest
+++ b/gnome-extra/gnome-packagekit/Manifest
@@ -4,15 +4,19 @@ Hash: SHA256
 DIST gnome-packagekit-3.10.1.tar.xz 4784332 SHA256 40f11968e6a40606486f232fd6f61348eb75dc465f25deb2f157f6546bbe4e26 SHA512 653dcbffa1a853d5613b8b758a2f4bc5bd49556e4f2ac339c204d911af6208e3ed814e04b90213ec967c4840741b5e431d3319ec298501e7c2a5f2ae1f5ca09f WHIRLPOOL 1485b1358dd30a31224aeff0661d1bfd14dc631f4e7a4e1f34d995d3c533f2e033932ce7e7de916502a9e5debb18e016a79ba591952bb43d022ca5f92bcdd92f
 DIST gnome-packagekit-3.12.1.tar.xz 4616104 SHA256 fec804f75d178bf2984828873491733338ed6f549e287afe16d7302da26c5ead SHA512 96870c13a4b09f0e6da822a01458278c82ed4af84eda99cfe854a4cd46f47af979f047f829a18f19294c8c92bddf6162069b270598ea7ecf02555cf9b9ed996c WHIRLPOOL 13e3c607314f6747e7318d2d984a2f9865d83f25dd545b2cf7e8befad7f24650df9b0346ab10c2131ef1307d552ebd0dc53f8940e9e4506970c3122202bf85ea
 DIST gnome-packagekit-3.12.2.tar.xz 4596908 SHA256 a4d5fca6f9481b48202f996c8a3835051c98b6e6df0929394704c3c41e28afb2 SHA512 e1e5cd296e4bc99c13d71805de530be644b4ac3a9bd5580d36ebd880a22292ec91ce9ad28a8ff66f0cb2285a5bc0c80f1b47421c9bbf7b2c9e2c1c17131bc21d WHIRLPOOL 66f23046d3fd262b5a5fbc470d762baaafbb75fb1c9e832f408672b8c399580a1ad2a9e7b03acd81c00c6a486074b224eed4b15d1377354f557823f6282013de
-EBUILD gnome-packagekit-3.10.1.ebuild 3481 SHA256 3d4e22e6129f8305f2bbd4f8465f246cb6b641d339ca2f0714a1d2326ae6a9b1 SHA512 216e7b496c2fe1fdbd3e216dc3b3ac93380419958fab3db9394120ce68b894b8fe3ce30be4265f758f1da4d6dafa1c5d48bc82f22a6f803625dd2ef615e96c57 WHIRLPOOL 77320ecf26e314f651a6aed3d1340de14d5481945c4ce306fdd9aa5b70a935cbb2a77c377a2256e5120aca5828e3c3c7cce3142148aeb2a7528733fe8c6b953c
+EBUILD gnome-packagekit-3.10.1.ebuild 3520 SHA256 01d36f22d5bc6b62ab6ae27d0bbe9eb33b2df34f4ff6ff91ed70e0126f6c9900 SHA512 7d1697ff308af0ef61e6d9839f7bb5ebe8a4d666bb72f8447aec62015b9bac4c4205658febce6a78cd0406664f9c0a100a30d2ca8ae53ae8aa30d59c510d38fb WHIRLPOOL 6f5f4b6800d387a777a60e1a69ac0ee48827184406df34990b5d26b18d29649195e85dac986f58f35077e3dddc691ab2132b2052a38e179677908e6c1bc2ee3c
 EBUILD gnome-packagekit-3.12.1.ebuild 2714 SHA256 d12ba9a439a58c7046c85c0a80e04b23dd6ea9a27789e4a610fd60e8cd9c4c72 SHA512 bcee100be4b9e62c797adcb1c520b52906f3bee7ff4ad5528ba47e04e3a751f65a6e28baff1b33cdb8a46510049d0370b86f4e93e8e6889ecef25974f6c6449d WHIRLPOOL c1c4fdc9275fbf0731209baeca2a4fa3ac9ee086e0a83e109a12aeb309057afceaa1077b5c75e7fbd98e39af5628994add2ed248b7862828233193443b7ce973
 EBUILD gnome-packagekit-3.12.2.ebuild 2703 SHA256 3ff247cfd8b95d87bdf5f49737674a50bfd9f68d9f041a1a18d07e33148b261e SHA512 bfcd1b4461036190cf117f55661c51186957ac5a37d39b3389c17d5aadc6be706016690789d531d225ade12d24349abe80951b7858ce64c0385fac37ec3bbc88 WHIRLPOOL 7ee124bc672ca5ff3daa8b6da686580f062bb65e3b67e98bd8ff9ed51d0eec9cf277ec46893b4020305ee5c2cf2a0e99e70cf831d3676ca01b117922acf4f285
-MISC ChangeLog 3434 SHA256 2d799344ebfee21b86d5eaf1fe41de04f56b5a74e8ba5dde0c5c7f9df3a244ec SHA512 59672ddac390b1c026e45196c2ee81c16651e5a66e1c3610db1ddde28b0d54666a97eb0333102812df1e391c08c7ac435a6a4e6d13901deef585b17f752d551f WHIRLPOOL aa869dbcf8166549ec5e0b06336889df20a1ab3dba4ce4babd285c01a886941e42218fe68359d1e3a3059fc4ab2923c46b0e15a0c6d95fcebf4675416cd24055
+MISC ChangeLog 3578 SHA256 eea96ca08ffbc76d8e9cc9043efd347a3d6cc2ec32819e58391a0ada8dfea6dc SHA512 0e2c400bf968022bd4e0a51539053dffd6fbbc2632c2d2aa30c00ef94552ea058a99a9f08f88a9a80e4dc1aa6903a023c7176d890dc08e3b494973c8d782691d WHIRLPOOL 5f3570ad1743324c7665b98e23d5399f05f8b744a6b62826fb3d5e702ccd9857836baa665266b1042ac37809b569f9c84aa0c322b92c2719c0f3a9b4388b1884
 MISC metadata.xml 299 SHA256 ecf78cbcb3f4b5087662db027c7eff16dd871674a6af4b31b978562b8168e876 SHA512 1f6b376546972763f6549a3d55b4f23edf9b3cf7231883e6f8efe6d6f8f789448a24f3f93d3a2c3d427ed747c0f03ce91cc0b94016bcb0008140d3ec9556d30d WHIRLPOOL f6c087ab612efe684060a454ae332ae19ae801a7178a63a884e354ca190b57d1ceabc181f3b7a05355b141af19199564199ae06d42178fc356c235e3966fdea7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlOJmUUACgkQCaWpQKGI+9QspgCeJXSdt76DuHNDY6OeY9JBs823
-H7cAnRa9yc/GTUPaaoB5L7rerYMeItcY
-=EQVN
+iQEcBAEBCAAGBQJTilaPAAoJEEdUh39IaPFNhtAH/j2CxfBNJhth8FzA48KuYMNa
+lhzjL8V3DHRcXz/mzjBQvkcPRE9O5MMmiHdJiLzA7d1W2v3WaIDjIx/tGRv11Sxy
+tC6cwhPYsusMyIEO5SqHog9rjH7UlBElCZ2v0kN7FvnEglRRbs0ESgFSCOaA+siN
+SqeAnk4GLb9qA9J52hBvo5zzzasmC7qhPXjJA6b+LrS4xrn9fLAeCp+D9CUTUUFL
+9LS/UZaN336NQiZdsK+hM5UpDBgVqx/PRzRk9qc5oTGLtX52FOuVwBY4R9+amleE
+pXlbgJCKy6Pfu4BPDVOiXc3Hl9J8vpuidMiWQ49SuhFTWnkBqhCSJ6z73a82OfI=
+=z84Q
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/gnome-packagekit/gnome-packagekit-3.10.1.ebuild b/gnome-extra/gnome-packagekit/gnome-packagekit-3.10.1.ebuild
index 806373416623..19bb1f7016c6 100644
--- a/gnome-extra/gnome-packagekit/gnome-packagekit-3.10.1.ebuild
+++ b/gnome-extra/gnome-packagekit/gnome-packagekit-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-extra/gnome-packagekit/gnome-packagekit-3.10.1.ebuild,v 1.1 2014/02/17 23:44:01 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-packagekit/gnome-packagekit-3.10.1.ebuild,v 1.2 2014/05/31 22:26:19 ssuominen Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -31,7 +31,7 @@ RDEPEND="
 	>=app-admin/packagekit-gtk-0.7.2
 	>=media-libs/libcanberra-0.10[gtk3]
 	>=sys-apps/dbus-1.1.2
-	>=sys-power/upower-0.9.0
+	|| ( >=sys-power/upower-0.9.0 sys-power/upower-pm-utils )
 
 	media-libs/fontconfig
 	x11-libs/libX11
diff --git a/gnome-extra/gnome-power-manager/ChangeLog b/gnome-extra/gnome-power-manager/ChangeLog
index 7b6496b2c3e6..309bc78f44f5 100644
--- a/gnome-extra/gnome-power-manager/ChangeLog
+++ b/gnome-extra/gnome-power-manager/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-extra/gnome-power-manager
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-power-manager/ChangeLog,v 1.193 2014/05/31 08:59:13 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-power-manager/ChangeLog,v 1.194 2014/05/31 22:24:48 ssuominen Exp $
+
+  31 May 2014; Samuli Suominen <ssuominen@gentoo.org>
+  gnome-power-manager-2.32.0-r3.ebuild, gnome-power-manager-3.10.1.ebuild:
+  Allow falling back to sys-power/upower-pm-utils.
 
 *gnome-power-manager-3.12.2 (31 May 2014)
 
diff --git a/gnome-extra/gnome-power-manager/Manifest b/gnome-extra/gnome-power-manager/Manifest
index 1e23524eb8d5..6b55f0cfad01 100644
--- a/gnome-extra/gnome-power-manager/Manifest
+++ b/gnome-extra/gnome-power-manager/Manifest
@@ -12,16 +12,20 @@ DIST gnome-power-manager-2.32.0.tar.bz2 3892164 SHA256 17fa301bf7e133285c0e054ae
 DIST gnome-power-manager-3.10.1.tar.xz 464108 SHA256 71c79a2f74ca076153a4f2a5dfc28a1dcb9179722108644421033780950595e2 SHA512 5afa3999ec820b359f8f0dfae05ee8ba34e4645271b1bfb476424833550a1b522718eefdc6e36006cbf499f06a3a036dfc288c22b47074d1789dcf01270cc473 WHIRLPOOL 196e67e7a517cb36d3534d2a9e65d397be2795c6b8ccc7d99956b8092f3cf1c5d72e227d622e54dc2478934c677462dd87a1227cbc288f80553a1a136f7ab198
 DIST gnome-power-manager-3.12.0.tar.xz 465616 SHA256 4e24dbfc56961a2889b1c67554695e0329f99ba658aac15747fcbee263393d59 SHA512 9ef54fbbfdeceb36c1c480cebe7f37d41da05d497e28a217130d2bf0fce437c70199b4b8be289f63f3bd0a97343e2f3ea3bb49bbb8b77de2b11eb5cc10379e33 WHIRLPOOL fb2e8e730da822cf80612b1a78ac910e61d51085270bd02945915274453770e548991cad2716963966079d639911f43b619bc2f721b73a81cb063b4b3d12cee0
 DIST gnome-power-manager-3.12.2.tar.xz 466820 SHA256 f025a35810434e9d1b1fa69e581d2e399db4c87625baa3850232a6666b6cbc19 SHA512 94091eeb653b7bc761e3ca42650f1855c299348bd2c785d4c4a26ac9425e617d478cadefc27dcc5fee8aa36849fc6ddf5df4d2eb5169b2df843ee638b1b7e4fe WHIRLPOOL 67348b6b8cecc6eada1091b5de5be5a74e019bbbf45ca82542e69a311e3c27a95a1c15a62eaba340184b4587c4f4f56df8ccb7312c4ed8da5e8b271a64c2f368
-EBUILD gnome-power-manager-2.32.0-r3.ebuild 3956 SHA256 a5aa17a1c06f44e7e74a77d8e849f2089275f0aeaf540c7f8784c0642cddf48b SHA512 7f38a71d688eb5aa07dc8037521825ddeb9bc1361206d56651d8ecb7e8475949c96d628e49e901d0fc7836db0c55d7d5edf8026c747b2e61dc930b640dbfcdba WHIRLPOOL 63c763eaa79bc2bb5b8c7e8018c68112910d32f8e17514f105ad0e12186c84560be3fc3158e676f41e9c712f77bc855d03c3ce12de63fd4dfe21736366466f8f
-EBUILD gnome-power-manager-3.10.1.ebuild 1591 SHA256 d3ef3aa2f42080f28a6e5305253b6263e450f421a140aee6c564814b0320d9d8 SHA512 b1d5406c5c76bb526aa220dc4cb0bdb57529e7c4ca62d235cd8ab6188f013f1422afcfd27c1196fa82bf17a01c1f9509315d6e779480d93fae4dda2a8a9d2919 WHIRLPOOL 45ae8c265091e7cd57a750424efeaef9db8ec537c25bf3add785471720b219c8e65ebcbfc8584738c3173c26dbbb49982fdf1a82d0a40bdd1ee3c25f4670fe86
+EBUILD gnome-power-manager-2.32.0-r3.ebuild 3989 SHA256 2e67cfc7ad39ee336e40081778164dbe9cea1d48735741ab42c8e48c4c57d808 SHA512 99854381e96cc9b87916629e420dd4b6c8af5c3a693a3be298c9f9655d9b136f512cd13c2abf9dca8444ee0edec097e59d79998da3544a7c9849c256878cff22 WHIRLPOOL b6e13c129d30a51a919aeb47d61b27f5dc16c4cf3ba0d8ffc0775b3ce71d6038b86e297bb140483c6f75f4af41901856731625bac29a80776f09661f027a7c6b
+EBUILD gnome-power-manager-3.10.1.ebuild 1626 SHA256 215ef273357b1a5054c4218ded5e93950eec3a73accad1d48a59af2b02aa8347 SHA512 b315aa121b5e0fbb447302467ebf796c12d633205845d61fcdaf744fcda524b36ca72ab526c0e538d4a623724cfa5f4e533d794a259b0a7f3c2ecf3d659734c9 WHIRLPOOL 0bd052dc0afc7e415a38587eb7b3626dd59078a648bae81a7be76ff5828a7d48d9b587552e357e541de80aae14ed19fd79f889841f31423658a365029a3ff1f6
 EBUILD gnome-power-manager-3.12.0.ebuild 1590 SHA256 beac1d6e3556f80efa2678aa33782214ceed0047a2f93a07729d605af525d029 SHA512 5e3396bc8d6a94801ad14d85a0841675e417d44966748769c81c51abb07a98565fa2a394411ad29d2dc9876845be908d80e086734f057ce22ef25c04f6266551 WHIRLPOOL 4cb362b4517fbed4a6583a311f0e1d3baab307198faf2a39b720f7d2bfd2ac2d71a7ff6e9d51111d3a4a086b55e122f481475c09f6d9e5023a1604f101af60ef
 EBUILD gnome-power-manager-3.12.2.ebuild 1555 SHA256 652061f8f68c33c601915b84391d6d6e4b722224be7dab5963d7cf85392a13ad SHA512 d8d1bcb492d13247ec3df0ba69d0c2bf725b77ce8198c4ab54dff519af48d6b94994d53793c0ab1f092d17c8aaa20b3898f9d8bf44b31b9f35b74ab23e190749 WHIRLPOOL cc2ea16ae44c8a9a4380382a5cd179738cc95d51da77a0df39dbf95f7aafaa96f90fd3fd7ec7d2497afac103af4f5040e92f3dd3f3ad27b1a97cc7160b6a960a
-MISC ChangeLog 32623 SHA256 e3b25a3c72417ed61fb4cb51348250bc5810e37c45ac3586d693d45cbe892429 SHA512 abdd3551e525650557ae03b93fec382f6a7f8fa38cd7b977851bf18133da3e50e79612d50f61429ee8d2b88224a25642360506912aae811f258b9f78baec2fad WHIRLPOOL 7004b0808dfbdbb6269f27d494288066a5fac0b1f23330b5e01b3be1737e10cc12de7c54962b2f55091248966b67cd1847a65f08470eb621bbc6b9d806f03f78
+MISC ChangeLog 32808 SHA256 9370637f793decaeec03afb30626f549170c0d6b88adc65dbe0a091795e972ee SHA512 42fd46c23f5e1dd4dab4bf1d6fbd725ba98bf838dfcf0694f2f0e5f77d0b2520bfbee1958e78d24f2cc871714671163389d8564a7f4b4996db4d24d932ee73fa WHIRLPOOL 362af38fe12dc8db8a26a4b893e9aeb4b56f3d191c1c73d1077082b285e775d8a899b6e152bd6fd88550bbb0f20479b2b4861e3f99e6019607a334a8fb525072
 MISC metadata.xml 400 SHA256 1c5d6e0a437c1a1c04299a5d1823ab8551019bd7ae120dac19670cc72fa22cf7 SHA512 7b119f2023d172590e884096d474fba4ff2bd95bdb2ff6b5390401ff5ffd3efd66cd2a0ac3b54be3389b5c88113eaa2cee77a90d6e71861e1ecf7bdefd853a56 WHIRLPOOL 01491b961fffe22ea484b375eebdbcd6ed0a9d255b85fbd2e790bb33c21c324dec33029546fed6b2a9c439f0ae613e7ee68554b723d08a7b74e5a3eb133e34fc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlOJmeIACgkQCaWpQKGI+9RmMgCfdb6/rD1uxzRUcEIERXWVr60t
-1hUAniH6u68b5Ib5Ke/q9VAa6oKaqC71
-=AyHl
+iQEcBAEBCAAGBQJTilY1AAoJEEdUh39IaPFNAWkIAJxbdGGpMznqDpSrqSfst7V9
+iQHPV6tq9WyFinFUdjJeiZCObot4azooepmLxU31rAQ5yGtFpzLkBVyGsCiVsdRJ
+k87hKpKGAIUd8D/zIa6q23tTZDyZaJjR84Gj+Y/hkk32P/Nm0XCV26eZLe0XPlza
+WzpXpX5Syj2jSVszVk1oycgkNWQKIkb20NyFwH2gpJt9tnf343PCN0ANQ+xNYdP9
+14kbLoEoj93sgQ2RVyBwrfekywew5QhkUcL+cGtU+LmPpC/PT5KjUmMV+RTPkIMi
+/tthfuN1BV/4fijgYRJfuTeNm4tQUCg240rDDhAEvU4GtbioVNyP/XscrPXX76M=
+=KI95
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/gnome-power-manager/gnome-power-manager-2.32.0-r3.ebuild b/gnome-extra/gnome-power-manager/gnome-power-manager-2.32.0-r3.ebuild
index c515451470f5..4a168a32d28d 100644
--- a/gnome-extra/gnome-power-manager/gnome-power-manager-2.32.0-r3.ebuild
+++ b/gnome-extra/gnome-power-manager/gnome-power-manager-2.32.0-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-power-manager/gnome-power-manager-2.32.0-r3.ebuild,v 1.7 2012/07/15 17:41:20 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-power-manager/gnome-power-manager-2.32.0-r3.ebuild,v 1.8 2014/05/31 22:24:48 ssuominen Exp $
 
 EAPI="4"
 GNOME_TARBALL_SUFFIX="bz2"
@@ -29,7 +29,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.13.0:2
 	>=x11-libs/cairo-1
 	>=gnome-base/gconf-2.10:2[policykit?]
 	>=media-libs/libcanberra-0.10[gtk]
-	>=sys-power/upower-0.9.1
+	|| ( <sys-power/upower-0.99 sys-power/upower-pm-utils )
 	>=dev-libs/libunique-1.1:1
 	>=x11-apps/xrandr-1.3
 	>=x11-proto/xproto-7.0.15
diff --git a/gnome-extra/gnome-power-manager/gnome-power-manager-3.10.1.ebuild b/gnome-extra/gnome-power-manager/gnome-power-manager-3.10.1.ebuild
index c96880d234c6..f6f2dd749808 100644
--- a/gnome-extra/gnome-power-manager/gnome-power-manager-3.10.1.ebuild
+++ b/gnome-extra/gnome-power-manager/gnome-power-manager-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-extra/gnome-power-manager/gnome-power-manager-3.10.1.ebuild,v 1.5 2014/03/09 12:00:06 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-power-manager/gnome-power-manager-3.10.1.ebuild,v 1.6 2014/05/31 22:24:48 ssuominen Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -19,7 +19,7 @@ COMMON_DEPEND="
 	>=dev-libs/glib-2.36:2
 	>=x11-libs/gtk+-3.3.8:3
 	>=x11-libs/cairo-1
-	>=sys-power/upower-0.9.1
+	|| ( <sys-power/upower-0.99 sys-power/upower-pm-utils )
 "
 RDEPEND="${COMMON_DEPEND}
 	x11-themes/gnome-icon-theme-symbolic